X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FGCJ.cc;h=0173e0a066c78c03a2dae124c44b67f556b1b417;hb=6eaf54fa906754ce35a7db0e8207fc6bbde5464d;hp=ca5aa9b2415c20c8e24c629e2b1e3480016f7f79;hpb=3591b88b94a6bb378af3d4abe6eb5233ce583104;p=org.ibex.core.git

diff --git a/src/org/ibex/plat/GCJ.cc b/src/org/ibex/plat/GCJ.cc
index ca5aa9b..0173e0a 100644
--- a/src/org/ibex/plat/GCJ.cc
+++ b/src/org/ibex/plat/GCJ.cc
@@ -1,9 +1,19 @@
-// 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/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>
+#include <java/lang/RuntimeException.h>
+#include <org/ibex/plat/GCJ.h>
+#include <org/ibex/util/Log.h>
 extern "C" {
 
 // hack for broken Solaris headers
@@ -14,14 +24,6 @@ extern "C" {
 #include <setjmp.h>
 #include "jpeglib.h"
 }
-#include <org/ibex/Platform.h>
-#include <org/ibex/Picture.h>
-#include <org/ibex/plat/GCJ.h>
-#include <java/io/InputStream.h>
-#include <java/io/ByteArrayInputStream.h>
-#include <java/lang/RuntimeException.h>
-#include <org/ibex/plat/GCJ.h>
-#include <org/ibex/util/Log.h>
 
 #ifdef TRUE
 #undef TRUE
@@ -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;