From bfe58977ba6c6386d020a1355561e1102d907884 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Fri, 4 Sep 2009 06:02:23 +0000
Subject: improve handling of importinc/netpbm/xxx.h

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@980 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/jpeg2000/libjasper/base/jas_stream.c          | 2 +-
 converter/other/jpeg2000/libjasper/include/jasper/jas_image.h | 2 +-
 converter/other/jpeg2000/libjasper/include/jasper/jas_types.h | 2 +-
 converter/other/jpeg2000/libjasper/jp2/jp2_cod.c              | 2 +-
 converter/other/jpeg2000/libjasper/jpc/jpc_mqcod.h            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'converter/other/jpeg2000')

diff --git a/converter/other/jpeg2000/libjasper/base/jas_stream.c b/converter/other/jpeg2000/libjasper/base/jas_stream.c
index 4c84e6c2..19dc7c11 100644
--- a/converter/other/jpeg2000/libjasper/base/jas_stream.c
+++ b/converter/other/jpeg2000/libjasper/base/jas_stream.c
@@ -130,7 +130,7 @@
 #include <io.h>
 #endif
 
-#include "pm.h"
+#include "netpbm/pm.h"
 
 #include "jasper/jas_types.h"
 #include "jasper/jas_stream.h"
diff --git a/converter/other/jpeg2000/libjasper/include/jasper/jas_image.h b/converter/other/jpeg2000/libjasper/include/jasper/jas_image.h
index d6456f7c..558f4368 100644
--- a/converter/other/jpeg2000/libjasper/include/jasper/jas_image.h
+++ b/converter/other/jpeg2000/libjasper/include/jasper/jas_image.h
@@ -123,7 +123,7 @@
 * Includes.
 \******************************************************************************/
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 #include <jasper/jas_stream.h>
 #include <jasper/jas_seq.h>
 
diff --git a/converter/other/jpeg2000/libjasper/include/jasper/jas_types.h b/converter/other/jpeg2000/libjasper/include/jasper/jas_types.h
index 4d3a4988..fbcb2ffb 100644
--- a/converter/other/jpeg2000/libjasper/include/jasper/jas_types.h
+++ b/converter/other/jpeg2000/libjasper/include/jasper/jas_types.h
@@ -4,7 +4,7 @@
    In Netpbm, we do that with pm_config.h, and the original Jasper
    method doesn't work.
 */
-#include "pm_config.h"
+#include "netpbm/pm_config.h"
 
 
 /* The below macro is intended to be used for type casts.  By using this
diff --git a/converter/other/jpeg2000/libjasper/jp2/jp2_cod.c b/converter/other/jpeg2000/libjasper/jp2/jp2_cod.c
index 4769c408..cb70fd24 100644
--- a/converter/other/jpeg2000/libjasper/jp2/jp2_cod.c
+++ b/converter/other/jpeg2000/libjasper/jp2/jp2_cod.c
@@ -123,7 +123,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 
 #include "jasper/jas_stream.h"
 #include "jasper/jas_malloc.h"
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_mqcod.h b/converter/other/jpeg2000/libjasper/jpc/jpc_mqcod.h
index 914f8e8a..5f99e021 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_mqcod.h
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_mqcod.h
@@ -123,7 +123,7 @@
 * Includes.
 \*****************************************************************************/
 
-#include "pm_c_util.h"
+#include "netpbm/pm_c_util.h"
 #include "jasper/jas_types.h"
 
 /*****************************************************************************\
-- 
cgit 1.4.1