questionable patch: merge of a lot of stuff from the svg branch

[org.ibex.core.git] / src / org / ibex / plat / GCJ.cc

diff --git a/src/org/ibex/plat/GCJ.cc b/src/org/ibex/plat/GCJ.cc
index 53e7f19..0173e0a 100644 (file)
--- a/src/org/ibex/plat/GCJ.cc
+++ b/src/org/ibex/plat/GCJ.cc
@@ -1,11 +1,13 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
 
 // Inclusions /////////////////////////////////////////////////////////
 
 #include <gcj/cni.h>
 #include <gcj/array.h>
-#include <org/ibex/Platform.h>
-#include <org/ibex/Picture.h>
+#include <org/ibex/plat/Platform.h>
+#include <org/ibex/graphics/Picture.h>
 #include <org/ibex/plat/GCJ.h>
 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>
@@ -99,7 +101,7 @@ void skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
     src->pub.bytes_in_buffer -= num_bytes;
 }
 
-void org::ibex::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::ibex::Picture* p) {
+void org::ibex::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::ibex::graphics::Picture* p) {
     struct jpeg_decompress_struct cinfo;
     my_error_mgr_t jerr;
     my_source_mgr_t src;