Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings: use accessor functions instead of deprecated struct fields. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43194 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2011-11-06 00:39:38 +00:00
parent 20cc8cc800
commit fdb0863fbe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/generate_boot_screen.cpp
View File

@ -201,11 +201,11 @@ read_png(const char* filename, int& width, int& height, png_bytep*& rowPtrs,
png_set_bgr(pngPtr); png_set_bgr(pngPtr);
png_read_info(pngPtr, infoPtr); png_read_info(pngPtr, infoPtr);
width = infoPtr->width; width = (int)png_get_image_width(pngPtr, infoPtr);
height = infoPtr->height; height = (int)png_get_image_height(pngPtr, infoPtr);
if (infoPtr->bit_depth != 8) if (png_get_bit_depth(pngPtr, infoPtr) != 8)
error("[read_png] File %s has wrong bit depth\n", filename); error("[read_png] File %s has wrong bit depth\n", filename);
if ((int)infoPtr->rowbytes < width * 3) { if ((int)png_get_rowbytes(pngPtr, infoPtr) < width * 3) {
error("[read_png] File %s has wrong color type (RGB required)\n", error("[read_png] File %s has wrong color type (RGB required)\n",
filename); filename);
} }
@ -221,7 +221,7 @@ read_png(const char* filename, int& width, int& height, png_bytep*& rowPtrs,
rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height); rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height);
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
rowPtrs[y] = (png_byte*)malloc(infoPtr->rowbytes); rowPtrs[y] = (png_byte*)malloc(png_get_rowbytes(pngPtr, infoPtr));
png_read_image(pngPtr, rowPtrs); png_read_image(pngPtr, rowPtrs);
} }
@ -252,7 +252,7 @@ write_24bit_image(const char* baseName, int width, int height, png_bytep* rowPtr
static void static void
write_8bit_image(const char* baseName, int width, int height, unsigned char** rowPtrs) write_8bit_image(const char* baseName, int width, int height, unsigned char** rowPtrs)
{ {
int buffer[128]; //int buffer[128];
// buffer[0] stores count, buffer[1..127] holds the actual values // buffer[0] stores count, buffer[1..127] holds the actual values
fprintf(sOutput, "static uint8 %s8BitCompressedImage[] = {\n\t", fprintf(sOutput, "static uint8 %s8BitCompressedImage[] = {\n\t",