From 35dc2e5a640375d51119f2051a240454b5f5b8c8 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Sat, 14 Sep 2013 03:59:43 +0200
Subject: Do not recompress images when embedding and generating PDFs. Fixes
 blocker bug #871563.

Fixed bugs:
  - https://launchpad.net/bugs/871563

(bzr r12516)
---
 src/extension/internal/image-resolution.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/extension/internal/image-resolution.cpp')

diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 3c254a59c..a9d33e831 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -14,13 +14,21 @@
 #include "image-resolution.h"
 
 #define IR_TRY_PNG 1
+#include <png.h>
+
 #ifdef HAVE_EXIF
-#define IR_TRY_EXIF 1
+#include <math.h>
+#include <libexif/exif-data.h>
 #endif
+
 #define IR_TRY_EXIV 0
+
 #ifdef HAVE_JPEG
 #define IR_TRY_JFIF 1
+#include <jpeglib.h>
+#include <setjmp.h>
 #endif
+
 #ifdef WITH_IMAGE_MAGICK
 #include <Magick++.h>
 #endif
@@ -62,8 +70,6 @@ double ImageResolution::y() const {
   
   
 #if IR_TRY_PNG
-
-#include <png.h>
   
 static bool haspngheader(FILE *fp) {
     unsigned char header[8];
@@ -133,9 +139,6 @@ void ImageResolution::readpng(char const *) {
 
 #if IR_TRY_EXIF
 
-#include <math.h>
-#include <libexif/exif-data.h>
-
 static double exifDouble(ExifEntry *entry, ExifByteOrder byte_order) {
     switch (entry->format) {
         case EXIF_FORMAT_BYTE: {
@@ -264,9 +267,6 @@ void ImageResolution::readexiv(char const *) {
 
 #if IR_TRY_JFIF
 
-#include <jpeglib.h>
-#include <setjmp.h>
-
 static void irjfif_error_exit(j_common_ptr cinfo) {
     longjmp(*(jmp_buf*)cinfo->client_data, 1);
 }
-- 
cgit v1.2.3