diff options
Diffstat (limited to 'src/render/jpgfile.cc')
| -rw-r--r-- | src/render/jpgfile.cc | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/render/jpgfile.cc b/src/render/jpgfile.cc index 5ed3ff8..890c543 100644 --- a/src/render/jpgfile.cc +++ b/src/render/jpgfile.cc @@ -23,14 +23,15 @@ http://www.zarb.org/~gc/html/libpng.html #undef HAVE_STDLIB_H #endif extern "C" { - #include "jpeglib.h" +#include "jpeglib.h" } -namespace render { +namespace render +{ Image *JPG::load(const char *filename) { - struct jpeg_decompress_struct jpeg_decompression_info; + struct jpeg_decompress_struct jpeg_decompression_info; struct jpeg_error_mgr jerr; int row_stride = 0; @@ -44,20 +45,20 @@ Image *JPG::load(const char *filename) //con_warn << "Could not open " << filename << std::endl; return 0; } - + // initialize decompression structures jpeg_decompression_info.err = jpeg_std_error(&jerr); jpeg_create_decompress(&jpeg_decompression_info); - jpeg_stdio_src(&jpeg_decompression_info, jpg_file->handle()); + jpeg_stdio_src(&jpeg_decompression_info, jpg_file->handle()); // read JPEG header jpeg_read_header(&jpeg_decompression_info, TRUE); jpeg_start_decompress(&jpeg_decompression_info); row_stride = jpeg_decompression_info.output_width * jpeg_decompression_info.output_components; - image = new Image(jpeg_decompression_info.output_width, - jpeg_decompression_info.output_height, - jpeg_decompression_info.output_components); + image = new Image(jpeg_decompression_info.output_width, + jpeg_decompression_info.output_height, + jpeg_decompression_info.output_components); // read pixel data JSAMPLE *row_pointer; @@ -65,11 +66,11 @@ Image *JPG::load(const char *filename) row_pointer = (*image)[jpeg_decompression_info.output_scanline*row_stride]; jpeg_read_scanlines(&jpeg_decompression_info, &row_pointer, 1); } - jpeg_finish_decompress(&jpeg_decompression_info); + jpeg_finish_decompress(&jpeg_decompression_info); // destroy decompression structures jpeg_destroy_decompress(&jpeg_decompression_info); - filesystem::close(jpg_file); + filesystem::close(jpg_file); con_debug << " " << filename << " " << image->width() << "x" << image->height() << "x" << image->bpp() << "bpp" << std::endl; return image; @@ -83,10 +84,10 @@ void JPG::save(const char *filename, Image & image, int jpeg_quality) JSAMPROW row_pointer[1]; int row_stride; - FILE *jpg_file = fopen(filename, "wb"); - if (!jpg_file) { - con_warn << "Could not write " << filename << std::endl; - return; + FILE *jpg_file = fopen(filename, "wb"); + if (!jpg_file) { + con_warn << "Could not write " << filename << std::endl; + return; } jpeg_compression_info.err = jpeg_std_error(&jerr); |