|
Line
Link Here
|
| 0 |
-- gigi-9999/GG/src/GIL/extension/io/png_io_private.hpp |
0 |
++ gigi-9999/GG/src/GIL/extension/io/png_io_private.hpp |
|
Lines 26-31
Link Here
|
| 26 |
#include "../../gil_all.hpp" |
26 |
#include "../../gil_all.hpp" |
| 27 |
#include "io_error.hpp" |
27 |
#include "io_error.hpp" |
| 28 |
|
28 |
|
|
|
29 |
|
| 30 |
#define int_p_NULL (int *)NULL |
| 31 |
#define png_infopp_NULL (png_infopp)NULL |
| 32 |
|
| 29 |
namespace boost { namespace gil { |
33 |
namespace boost { namespace gil { |
| 30 |
|
34 |
|
| 31 |
namespace detail { |
35 |
namespace detail { |
|
Lines 312-318
Link Here
|
| 312 |
case 4: |
312 |
case 4: |
| 313 |
case 8: |
313 |
case 8: |
| 314 |
if(bit_depth < 8) |
314 |
if(bit_depth < 8) |
| 315 |
png_set_gray_1_2_4_to_8(_png_ptr); |
315 |
png_set_expand_gray_1_2_4_to_8(_png_ptr); |
| 316 |
png_read_and_convert_pixels<gray8_pixel_t,gray8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); |
316 |
png_read_and_convert_pixels<gray8_pixel_t,gray8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); |
| 317 |
break; |
317 |
break; |
| 318 |
case 16: |
318 |
case 16: |
|
Lines 350-356
Link Here
|
| 350 |
case 4: |
350 |
case 4: |
| 351 |
case 8: |
351 |
case 8: |
| 352 |
if(bit_depth < 8) |
352 |
if(bit_depth < 8) |
| 353 |
png_set_gray_1_2_4_to_8(_png_ptr); |
353 |
png_set_expand_gray_1_2_4_to_8(_png_ptr); |
| 354 |
png_read_and_convert_pixels<gray_alpha8_pixel_t,gray_alpha8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); |
354 |
png_read_and_convert_pixels<gray_alpha8_pixel_t,gray_alpha8_ref_t>(view,_cc,_png_ptr,width,height,interlaced); |
| 355 |
break; |
355 |
break; |
| 356 |
case 16: |
356 |
case 16: |
