[haiku-commits] r43194 - haiku/trunk/src/tools

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Nov 2011 01:39:38 +0100 (CET)

Author: mmu_man
Date: 2011-11-06 01:39:38 +0100 (Sun, 06 Nov 2011)
New Revision: 43194
Changeset: https://dev.haiku-os.org/changeset/43194

Modified:
   haiku/trunk/src/tools/generate_boot_screen.cpp
Log:
Fix some warnings: use accessor functions instead of deprecated struct fields.


Modified: haiku/trunk/src/tools/generate_boot_screen.cpp
===================================================================
--- haiku/trunk/src/tools/generate_boot_screen.cpp      2011-11-05 23:44:17 UTC 
(rev 43193)
+++ haiku/trunk/src/tools/generate_boot_screen.cpp      2011-11-06 00:39:38 UTC 
(rev 43194)
@@ -201,11 +201,11 @@
        png_set_bgr(pngPtr);
 
        png_read_info(pngPtr, infoPtr);
-       width = infoPtr->width;
-       height = infoPtr->height;
-       if (infoPtr->bit_depth != 8)
+       width = (int)png_get_image_width(pngPtr, infoPtr);
+       height = (int)png_get_image_height(pngPtr, infoPtr);
+       if (png_get_bit_depth(pngPtr, infoPtr) != 8)
                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",
                        filename);
        }
@@ -221,7 +221,7 @@
 
        rowPtrs = (png_bytep*)malloc(sizeof(png_bytep) * height);
        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);
 }
@@ -252,7 +252,7 @@
 static void
 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
 
        fprintf(sOutput, "static uint8 %s8BitCompressedImage[] = {\n\t",


Other related posts:

  • » [haiku-commits] r43194 - haiku/trunk/src/tools - revol