Index: /applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- /applications/editors/josm/plugins/piclayer/build.xml	(revision 27143)
+++ /applications/editors/josm/plugins/piclayer/build.xml	(revision 27144)
@@ -22,5 +22,5 @@
 -->
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="PicLayer - fixing #7075.2"/>
+    <property name="commit.message" value="PicLayer - fixing #7075.1"/>
     <property name="plugin.main.version" value="4549"/>
     <!--
Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java
===================================================================
--- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java	(revision 27143)
+++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java	(revision 27144)
@@ -38,5 +38,5 @@
 /**
  * Action for resetting properties of an image.
- * 
+ *
  * TODO Four almost identical classes. Refactoring needed.
  */
@@ -46,5 +46,5 @@
     // Owner layer of the action
     PicLayerAbstract m_owner = null;
-    
+
     /**
      * Constructor
@@ -55,8 +55,9 @@
         m_owner = owner;
     }
-    
+
     /**
      * Action handler
      */
+    @Override
     public void actionPerformed(ActionEvent arg0) {
         // Save dialog
@@ -75,10 +76,10 @@
                 file = new File( path + CalibrationFileFilter.EXTENSION );
             }
-                        
+
             // Save
             Properties props = new Properties();
             m_owner.saveCalibration(props);
             try {
-                props.store(new FileOutputStream(file), tr("JOSM PicLayer plugin calibration data"));
+                props.store(new FileOutputStream(file), "JOSM PicLayer plugin calibration data");
             } catch (Exception e) {
                 // Error
@@ -86,5 +87,5 @@
                 JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()));
             }
-        }   
+        }
     }
 }
Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java
===================================================================
--- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java	(revision 27143)
+++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java	(revision 27144)
@@ -384,9 +384,13 @@
         AffineTransform transform;
 
+        double pos_x = Double.valueOf(props.getProperty(POSITION_X));
+        double pos_y = Double.valueOf(props.getProperty(POSITION_Y));
+
+        imagePosition = new EastNorth(pos_x, pos_y);
+        initialImageScale = Double.valueOf(props.getProperty(INITIAL_SCALE)); //in_scale
         if (props.containsKey(SCALEX)) {// old format
             double in_pos_x = Double.valueOf( props.getProperty(INITIAL_POS_X));
             double in_pos_y = Double.valueOf( props.getProperty(INITIAL_POS_Y));
             double angle = Double.valueOf( props.getProperty(ANGLE));
-            double in_scale = Double.valueOf( props.getProperty(INITIAL_SCALE));
             double scale_x = Double.valueOf( props.getProperty(SCALEX));
             double scale_y = Double.valueOf( props.getProperty(SCALEY));
@@ -397,15 +401,8 @@
 
             // transform to matrix from these values - need testing
-            transform = AffineTransform.getRotateInstance(angle);
+            transform = AffineTransform.getRotateInstance(angle/180*Math.PI);
             transform.scale(scale_x, scale_y);
             transform.shear(shear_x, shear_y);
-            initialImageScale = in_scale;
         } else {
-            double pos_x = Double.valueOf(props.getProperty(POSITION_X));
-            double pos_y = Double.valueOf(props.getProperty(POSITION_Y));
-
-            imagePosition = new EastNorth(pos_x, pos_y);
-            initialImageScale = Double.valueOf(props.getProperty(INITIAL_SCALE)); //in_scale
-
             // initialize matrix
             double[] matrix = new double[6];