From d51c6eed799d182e335d5fcea5571fc678dcef6a Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 21 May 2024 18:25:42 +0900
Subject: Fix FTBFS on OMV. This resolves issue #38

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 src/imageutils/transupp.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'src/imageutils/transupp.c')

diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
index 0ede0db..8003c48 100644
--- a/src/imageutils/transupp.c
+++ b/src/imageutils/transupp.c
@@ -1,8 +1,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <jpeglib.h>
+#include <jpegint.h>
 #include <jerror.h>
 
+/* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row(). */
+#define JPEG_INTERNALS
+
+#include "jinclude.h"
+#include "transupp.h"		/* My own external interface */
+
 #if JPEG_LIB_VERSION >= 80
 
 /*
@@ -19,14 +27,6 @@
  * interfaces.
  */
 
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h"         /* My own external interface */
 #include <ctype.h>            /* to declare isdigit() */
 
 
@@ -1591,8 +1591,6 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
 
 #else // JPEG_LIB_VERSION >= 80
 
-#include <jpegint.h>
-
 /*
  * transupp.c
  *
@@ -1607,16 +1605,6 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
  * interfaces.
  */
 
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h"		/* My own external interface */
-
-
 #if TRANSFORMS_SUPPORTED
 
 /*
-- 
cgit v1.2.1