[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : sandro
Repository : xara
Revision   : 1687
Date       : Thu Aug 10 12:09:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/filters/SVGFilter/tests/opacity2.svg
   M /Trunk/XaraLX/filters/SVGFilter/xargenerator.cpp

fixed bug #1416 (Imported data appears at wrong location)


Diff:
Index: Trunk/XaraLX/filters/SVGFilter/xargenerator.cpp
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/xargenerator.cpp	(revision 1686)
+++ Trunk/XaraLX/filters/SVGFilter/xargenerator.cpp	(revision 1687)
@@ -128,22 +128,29 @@
 	// XXX From this point on the error handling becomes a bit thin
 
 	ok = m_pExporter->WriteZeroSizedRecord(TAG_SPREAD);
+	/***/ ok = m_pExporter->WriteZeroSizedRecord(TAG_DOWN);
+
 	if (m_docSize != DocCoord(0, 0)) {
 		ok = Rec.Reinit(TAG_SPREADINFORMATION, TAG_SPREADINFORMATION_SIZE);
-		ok = Rec.WriteUINT32(m_docSize.x); // width
-		ok = Rec.WriteUINT32(m_docSize.y); // height
-		ok = Rec.WriteUINT32(10000);	   // margin
-		ok = Rec.WriteUINT32(0);		   // bleed
-		ok = Rec.WriteBYTE(2);			   // flags (shadow: on)
+		ok = Rec.WriteUINT32(m_docSize.x);		// width
+		ok = Rec.WriteUINT32(m_docSize.y);		// height
+		ok = Rec.WriteUINT32(10000);			// margin
+		ok = Rec.WriteUINT32(0);				// bleed
+		ok = Rec.WriteBYTE(2);					// flags (1:shadow)
 		ok = m_pExporter->WriteRecord(&Rec);
 	}
 
+	ok = Rec.Reinit(TAG_VIEWPORT, TAG_VIEWPORT_SIZE);
+	ok = Rec.WriteCoord(DocCoord(0, 0));		// bottom-left
+	ok = Rec.WriteCoord(DocCoord(m_docSize.x, m_docSize.y));// top-right
+	ok = m_pExporter->WriteRecord(&Rec);
+
 	// Write a layer
 	ok = m_pExporter->WriteZeroSizedRecord(TAG_LAYER);
-	ok = m_pExporter->WriteZeroSizedRecord(TAG_DOWN);
+	/***/ ok = m_pExporter->WriteZeroSizedRecord(TAG_DOWN);
 
-	ok = Rec.Reinit(TAG_LAYERDETAILS, -1);
-	ok = Rec.WriteBYTE(13);
+	ok = Rec.Reinit(TAG_LAYERDETAILS, TAG_LAYERDETAILS_SIZE);
+	ok = Rec.WriteBYTE(1|4|8);					// flags (0:visible, 2:printable, 3:active)
 	ok = Rec.WriteUnicode(_T("Layer 1"));
 	ok = m_pExporter->WriteRecord(&Rec);
 
@@ -154,12 +161,13 @@
 {
 	bool ok = true;
 
-	// End of the layer
+	// End of layer
 	ok = m_pExporter->WriteZeroSizedRecord(TAG_UP);
 
-	// Write the end of file record
-	CXaraFileRecord Rec(0);
-	ok = Rec.Reinit(TAG_ENDOFFILE, 0);
+	// End of spread
+	ok = m_pExporter->WriteZeroSizedRecord(TAG_UP);
+
+	// Write end of file record
 	ok = m_pExporter->WriteZeroSizedRecord(TAG_ENDOFFILE);
 
 	return ok;
Index: Trunk/XaraLX/filters/SVGFilter/tests/opacity2.svg
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/tests/opacity2.svg	(revision 1686)
+++ Trunk/XaraLX/filters/SVGFilter/tests/opacity2.svg	(revision 1687)
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<svg width="300px" height="300px"
+<svg width="300px" height="250px"
  xmlns = 'http://www.w3.org/Graphics/SVG/svg-19990412.dtd'>
  <g style="fill:#444">
   <path d="M0,0v250h300v-250z"/>


Xara