|
Lines 77-83
ReaderPNG::ReaderPNG(const char *fileNam
Link Here
|
| 77 |
|
77 |
|
| 78 |
|
78 |
|
| 79 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
79 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
| 80 |
&bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); |
80 |
&bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL); |
| 81 |
|
81 |
|
| 82 |
if(bit_depth == 16) |
82 |
if(bit_depth == 16) |
| 83 |
png_set_strip_16(png_ptr); |
83 |
png_set_strip_16(png_ptr); |
|
Lines 88-94
ReaderPNG::ReaderPNG(const char *fileNam
Link Here
|
| 88 |
png_set_expand(png_ptr); |
88 |
png_set_expand(png_ptr); |
| 89 |
png_read_update_info(png_ptr, info_ptr); |
89 |
png_read_update_info(png_ptr, info_ptr); |
| 90 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
90 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
| 91 |
&bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); |
91 |
&bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL); |
| 92 |
} |
92 |
} |
| 93 |
|
93 |
|
| 94 |
if( color_type == PNG_COLOR_TYPE_GRAY || |
94 |
if( color_type == PNG_COLOR_TYPE_GRAY || |
|
Lines 96-102
ReaderPNG::ReaderPNG(const char *fileNam
Link Here
|
| 96 |
png_set_gray_to_rgb(png_ptr); |
96 |
png_set_gray_to_rgb(png_ptr); |
| 97 |
png_read_update_info(png_ptr, info_ptr); |
97 |
png_read_update_info(png_ptr, info_ptr); |
| 98 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
98 |
png_get_IHDR(png_ptr, info_ptr, &width, &height, |
| 99 |
&bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); |
99 |
&bit_depth, &color_type, &interlace_type,(int *) NULL, (int *) NULL); |
| 100 |
} |
100 |
} |
| 101 |
|
101 |
|
| 102 |
this->width=width; |
102 |
this->width=width; |
|
Lines 114-120
ReaderPNG::ReaderPNG(const char *fileNam
Link Here
|
| 114 |
} |
114 |
} |
| 115 |
|
115 |
|
| 116 |
png_read_end(png_ptr, info_ptr); |
116 |
png_read_end(png_ptr, info_ptr); |
| 117 |
png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); |
117 |
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
| 118 |
fclose(fp); |
118 |
fclose(fp); |
| 119 |
} |
119 |
} |
| 120 |
|
120 |
|
