From af427b47f4f2d8a417a6bbb43929696aab9e0af1 Mon Sep 17 00:00:00 2001 From: phr0z3nt04st Date: Sat, 3 Jul 2010 22:51:24 -0500 Subject: [PATCH] Switched back to memcpy from std::copy --- indra/llimage/llimagemetadatareader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llimage/llimagemetadatareader.cpp b/indra/llimage/llimagemetadatareader.cpp index bfdd529a0..c8b825bd9 100644 --- a/indra/llimage/llimagemetadatareader.cpp +++ b/indra/llimage/llimagemetadatareader.cpp @@ -7,8 +7,8 @@ LLJ2cParser::LLJ2cParser(U8* data,int data_size) if(data && data_size) { mData.resize(data_size); - //memcpy(&(mData[0]), data, data_size); - std::copy(data,data+data_size,mData.begin()); + memcpy(&(mData[0]), data, data_size); + //std::copy(data,data+data_size,mData.begin()); } mIter = mData.begin(); } @@ -83,8 +83,8 @@ std::string LLImageMetaDataReader::ExtractEncodedComment(U8* data,int data_size) //llinfos << "FOUND PAYLOAD" << llendl; std::vector payload(128); S32 i; - //memcpy(&(payload[0]), &(comment[2]), 128); - std::copy(comment.begin()+2,comment.end(),payload.begin()); + memcpy(&(payload[0]), &(comment[2]), 128); + //std::copy(comment.begin()+2,comment.end(),payload.begin()); if (payload[2] == payload[127]) { // emkdu.dll