[[ Drawing ]] Minor fixes

runrevmark · runrevmark · commit 86e42c6552bd · 2017-12-14T18:54:57.000Z
This patch fixes an incorrect constant in the SVG compiler
when computing preserve aspect ratio opcodes and removes
unused definitions.
diff --git a/extensions/script-libraries/drawing/drawing.livecodescript b/extensions/script-libraries/drawing/drawing.livecodescript
@@ -1011,7 +1011,6 @@ constant kMCGDrawingOpcodePath = 19
 
 constant kMCGDrawingTransformOpcodeEnd = 0
 constant kMCGDrawingTransformOpcodeAffine = 1
-//constant kMCGDrawingTransformOpcodeViewport = 2
 
 constant kMCGDrawingPaintOpcodeEnd = 0
 constant kMCGDrawingPaintOpcodeSolidColor = 1
@@ -1053,7 +1052,6 @@ constant kMCGDrawingPathOpcodeRelativeReverseArcTo = 22
 constant kMCGDrawingPathOpcodeReverseReflexArcTo = 23
 constant kMCGDrawingPathOpcodeRelativeReverseReflexArcTo = 24
 constant kMCGDrawingPathOpcodeCloseSubpath = 25
-constant kMCGDrawingPathOpcodeBearing = 26
 
 constant kMCGDrawingPreserveAspectRatioOpcodeNone = 0
 constant kMCGDrawingPreserveAspectRatioOpcodeXMinYMinMeet = 1
@@ -1292,8 +1290,8 @@ private function _svgEncodePreserveAspectRatio pPar
 		break
 	end switch
 	if word 2 of pPar is "slice" then
-		put tParOp - kMCGDrawingPreserveAspectRatioXMinYMinMeet + \
-						kMCGDrawingPreserveAspectRatioXMinYMinSlice into tParOp
+		put tParOp - kMCGDrawingPreserveAspectRatioOpcodeXMinYMinMeet + \
+						kMCGDrawingPreserveAspectRatioOpcodeXMinYMinSlice into tParOp
 	end if
 	return tParOp
 end _svgEncodePreserveAspectRatio
@@ -1306,9 +1304,6 @@ private command _svgEncodeTransform @xContext, pTransform
 			break
 		case "viewport"
 			_InternalError format("dynamic viewport transform not supported")
-
-			_svgEncodeOp xContext, kMCGDrawingTransformOpcodeViewport, tTransform[2], tTransform[3], tTransform[4], tTransform[5], tTransform[6], tTransform[7], tTransform[8], tTransform[9]
-			_svgEncodeOp xContext, _svgEncodePreserveAspectRatio(tTransform[10])
 			break
 		default
 			_InternalError format("unknown transform '%s'", tTransform[1])
diff --git a/libgraphics/src/drawing.cpp b/libgraphics/src/drawing.cpp
@@ -462,9 +462,8 @@ enum MCGDrawingPathOpcode : uint8_t
     kMCGDrawingPathOpcodeReverseReflexArcTo = 23,
     kMCGDrawingPathOpcodeRelativeReverseReflexArcTo = 24,
     kMCGDrawingPathOpcodeCloseSubpath = 25,
-    kMCGDrawingPathOpcodeBearing = 26,
     
-    kMCGDrawingPathOpcode_Last = kMCGDrawingPathOpcodeBearing,
+    kMCGDrawingPathOpcode_Last = kMCGDrawingPathOpcodeCloseSubpath,
 };
 
 inline bool MCGDrawingPathOpcodeIsRelativeArc(MCGDrawingPathOpcode p_opcode)
@@ -537,7 +536,6 @@ struct MCGDrawingVisitor
     void PathSmoothQuadraticTo(bool is_relative, MCGFloat x, MCGFloat y);
     void PathArcTo(bool is_relative, bool is_reflex, bool is_reverse, MCGFloat cx, MCGFloat cy, MCGFloat rotation, MCGFloat x, MCGFloat y);
     void PathCloseSubpath(void);
-    void PathBearing(MCGFloat angle);
     void PathEnd(void);
     
     void FillOpacity(MCGFloat opacity);
@@ -1784,17 +1782,6 @@ void MCGDrawingContext::ExecutePath(VisitorT& p_visitor)
                 p_visitor.PathArcTo(t_is_relative, t_is_reflex, t_is_reverse, t_rx, t_ry, t_rotation, t_x, t_y);
             }
             break;
-                
-            case kMCGDrawingPathOpcodeBearing:
-            {
-                MCGFloat t_angle;
-                if (!AngleScalar(t_angle))
-                {
-                    break;
-                }
-                p_visitor.PathBearing(t_angle);
-            }
-            break;
             
             case kMCGDrawingPathOpcodeCloseSubpath:
             {
@@ -2052,10 +2039,6 @@ struct MCGDrawingRenderVisitor
         last_point = first_point;
     }
     
-    void PathBearing(MCGFloat p_angle)
-    {
-    }
-    
     void PathEnd(void)
     {
         MCGContextFillAndStroke(gcontext);
