AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move rect_memcopy from helper to global static.

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1197713003
This commit is contained in:
egdaniel 2015-06-19 10:52:25 -07:00 committed by Commit bot
parent 7054257de9
commit 393551e338
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/SkConfig8888.cpp
View File

@ -126,17 +126,6 @@ bool SkSrcPixelInfo::convertPixelsTo(SkDstPixelInfo* dst, int width, int height)
return true;
}
static void rect_memcpy(void* dst, size_t dstRB, const void* src, size_t srcRB, size_t bytesPerRow,
int rowCount) {
SkASSERT(bytesPerRow <= srcRB);
SkASSERT(bytesPerRow <= dstRB);
for (int i = 0; i < rowCount; ++i) {
memcpy(dst, src, bytesPerRow);
dst = (char*)dst + dstRB;
src = (const char*)src + srcRB;
}
}
static void copy_g8_to_32(void* dst, size_t dstRB, const void* src, size_t srcRB, int w, int h) {
uint32_t* dst32 = (uint32_t*)dst;
const uint8_t* src8 = (const uint8_t*)src;
@ -222,7 +211,7 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
default:
return false;
}
rect_memcpy(dstPixels, dstRB, srcPixels, srcRB, width * srcInfo.bytesPerPixel(), height);
SkRectMemcpy(dstPixels, dstRB, srcPixels, srcRB, width * srcInfo.bytesPerPixel(), height);
return true;
}

11
src/core/SkConfig8888.h
View File

@ -34,4 +34,15 @@ struct SkSrcPixelInfo : SkPixelInfo {
bool convertPixelsTo(SkDstPixelInfo* dst, int width, int height) const;
};
static inline void SkRectMemcpy(void* dst, size_t dstRB, const void* src, size_t srcRB,
size_t bytesPerRow, int rowCount) {
SkASSERT(bytesPerRow <= srcRB);
SkASSERT(bytesPerRow <= dstRB);
for (int i = 0; i < rowCount; ++i) {
memcpy(dst, src, bytesPerRow);
dst = (char*)dst + dstRB;
src = (const char*)src + srcRB;
}
}
#endif