User: pere Date: 06/03/12 20:02:34 Modified: debian/patches 01_unused_sunapi.diff 02_imageio.patch Log: It is better to repack upstream zip file using unzip -a to get unix style line ends. Document the procedure and update patches to match. Revision Changes Path 1.3 +16 -16 openjump/debian/patches/01_unused_sunapi.diff CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/01_unused_sunapi.diff?annotate=1.3&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/01_unused_sunapi.diff?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/01_unused_sunapi.diff.diff?r1=1.3&r2=1.2&cvsroot= ----------------------------------- Index: 01_unused_sunapi.diff =================================================================== RCS file: /cvsroot/pkg-grass/openjump/debian/patches/01_unused_sunapi.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 01_unused_sunapi.diff 11 Mar 2006 22:27:47 -0000 1.2 +++ 01_unused_sunapi.diff 12 Mar 2006 20:02:34 -0000 1.3 @@ -6,22 +6,22 @@ --- openjump-1.0.orig/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java +++ openjump-1.0/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java @@ -35,8 +35,6 @@ - import java.awt.event.WindowEvent; - import java.util.Collection; - --import sun.security.action.GetLongAction; -- - import com.vividsolutions.jts.util.Assert; - - import com.vividsolutions.jump.I18N; + import java.awt.event.WindowEvent; + import java.util.Collection; + +-import sun.security.action.GetLongAction; +- + import com.vividsolutions.jts.util.Assert; + + import com.vividsolutions.jump.I18N; --- openjump-1.0.orig/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java +++ openjump-1.0/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java @@ -35,8 +35,6 @@ - - import javax.swing.JInternalFrame; - --import sun.security.action.GetBooleanAction; -- - import com.vividsolutions.jump.util.Blackboard; - import com.vividsolutions.jump.workbench.driver.DriverManager; - import com.vividsolutions.jump.workbench.model.LayerManager; + + import javax.swing.JInternalFrame; + +-import sun.security.action.GetBooleanAction; +- + import com.vividsolutions.jump.util.Blackboard; + import com.vividsolutions.jump.workbench.driver.DriverManager; + import com.vividsolutions.jump.workbench.model.LayerManager; 1.4 +30 -30 openjump/debian/patches/02_imageio.patch CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/02_imageio.patch?annotate=1.4&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/02_imageio.patch?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/openjump/debian/patches/02_imageio.patch.diff?r1=1.4&r2=1.3&cvsroot= ----------------------------------- Index: 02_imageio.patch =================================================================== RCS file: /cvsroot/pkg-grass/openjump/debian/patches/02_imageio.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- 02_imageio.patch 11 Mar 2006 22:27:47 -0000 1.3 +++ 02_imageio.patch 12 Mar 2006 20:02:34 -0000 1.4 @@ -6,34 +6,34 @@ --- openjump-1.0.orig/src/org/openjump/io/SIDLayer.java +++ openjump-1.0/src/org/openjump/io/SIDLayer.java @@ -52,11 +52,12 @@ - import java.util.Iterator; - import java.util.List; - -+import javax.imageio.ImageIO; -+import javax.imageio.ImageReader; -+import javax.imageio.stream.FileImageInputStream; -+ - import org.openjump.core.ui.plugin.layer.AddSIDLayerPlugIn; - --import com.sun.image.codec.jpeg.JPEGCodec; --import com.sun.image.codec.jpeg.JPEGDecodeParam; --import com.sun.image.codec.jpeg.JPEGImageDecoder; - import com.vividsolutions.jts.geom.Envelope; - import com.vividsolutions.jts.util.Assert; - import com.vividsolutions.jump.I18N; + import java.util.Iterator; + import java.util.List; + ++import javax.imageio.ImageIO; ++import javax.imageio.ImageReader; ++import javax.imageio.stream.FileImageInputStream; ++ + import org.openjump.core.ui.plugin.layer.AddSIDLayerPlugIn; + +-import com.sun.image.codec.jpeg.JPEGCodec; +-import com.sun.image.codec.jpeg.JPEGDecodeParam; +-import com.sun.image.codec.jpeg.JPEGImageDecoder; + import com.vividsolutions.jts.geom.Envelope; + import com.vividsolutions.jts.util.Assert; + import com.vividsolutions.jump.I18N; @@ -291,10 +292,11 @@ - - if (((jpgFile.exists()) && (jpgFile.isFile()) && (jpgFile.canRead()))) - { -- FileInputStream in = new FileInputStream(jpgFilename); -- JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); -- JPEGDecodeParam dp = decoder.getJPEGDecodeParam(); -- BufferedImage image = decoder.decodeAsBufferedImage(); -+ FileImageInputStream in = new FileImageInputStream(new File(jpgFilename)); -+ ImageReader decoder = (ImageReader) ImageIO.getImageReadersByFormatName("JPEG").next(); -+ decoder.setInput(in); -+ BufferedImage image = decoder.read(0); -+ decoder.dispose(); - in.close(); - - if (!sid_colorspace.equals("GREYSCALE")) + + if (((jpgFile.exists()) && (jpgFile.isFile()) && (jpgFile.canRead()))) + { +- FileInputStream in = new FileInputStream(jpgFilename); +- JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); +- JPEGDecodeParam dp = decoder.getJPEGDecodeParam(); +- BufferedImage image = decoder.decodeAsBufferedImage(); ++ FileImageInputStream in = new FileImageInputStream(new File(jpgFilename)); ++ ImageReader decoder = (ImageReader) ImageIO.getImageReadersByFormatName("JPEG").next(); ++ decoder.setInput(in); ++ BufferedImage image = decoder.read(0); ++ decoder.dispose(); + in.close(); + + if (!sid_colorspace.equals("GREYSCALE"))
_______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
