/
reorder-includes-imagemagick.patch
44 lines (32 loc) · 1.21 KB
/
reorder-includes-imagemagick.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Description: Re-order includes to work around bug 969128 in libmagick++-6.q16-dev
libmagick++ currently includes assert.h inside a namespace which breaks other
code that tries to use assert.h, re-order the includes to ensure that
assert.h gets included outside the namespace.
Author: Peter Michael Green <plugwash@raspbian.org>
Bug-Debian: https://bugs.debian.org/966904
Index: pfstools-2.1.0/src/fileformat/pfsinimgmagick.cpp
===================================================================
--- pfstools-2.1.0.orig/src/fileformat/pfsinimgmagick.cpp
+++ pfstools-2.1.0/src/fileformat/pfsinimgmagick.cpp
@@ -26,12 +26,12 @@
*/
#include <config.h>
+#include <pfs.h>
#include <Magick++.h>
#include <iostream>
#include <getopt.h>
-#include <pfs.h>
#define PROG_NAME "pfsinimgmagick"
Index: pfstools-2.1.0/src/fileformat/pfsoutimgmagick.cpp
===================================================================
--- pfstools-2.1.0.orig/src/fileformat/pfsoutimgmagick.cpp
+++ pfstools-2.1.0/src/fileformat/pfsoutimgmagick.cpp
@@ -28,13 +28,12 @@
#include <config.h>
-
+#include <pfs.h>
#include <Magick++.h>
#include <iostream>
#include <getopt.h>
-#include <pfs.h>
#define PROG_NAME "pfsoutimgmagick"