From eed6e9c2c229b10911a23976c47da79fc70a5b87 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 17 Jul 2011 21:47:09 +0200 Subject: - rename SPItem::i2d_affine to i2dt_affine, to clarify that it is item-to-desktop, not item-to-document. This should make it easier to spot bugs. - tag some instances where the document-to-desktop transform has been hardcoded (bzr r10466) --- src/extension/internal/odf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/extension/internal/odf.cpp') diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 6a350ab48..568c804a0 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -946,10 +946,10 @@ static Glib::ustring formatTransform(Geom::Affine &tf) static Geom::Affine getODFTransform(const SPItem *item) { //### Get SVG-to-ODF transform - Geom::Affine tf (item->i2d_affine()); + Geom::Affine tf (item->i2dt_affine()); //Flip Y into document coordinates double doc_height = SP_ACTIVE_DOCUMENT->getHeight(); - Geom::Affine doc2dt_tf = Geom::Affine(Geom::Scale(1.0, -1.0)); + Geom::Affine doc2dt_tf = Geom::Affine(Geom::Scale(1.0, -1.0)); /// @fixme hardcoded desktop transform doc2dt_tf = doc2dt_tf * Geom::Affine(Geom::Translate(0, doc_height)); tf = tf * doc2dt_tf; tf = tf * Geom::Affine(Geom::Scale(pxToCm)); @@ -986,7 +986,7 @@ static Geom::OptRect getODFBoundingBox(const SPItem *item) */ static Geom::Affine getODFItemTransform(const SPItem *item) { - Geom::Affine itemTransform (Geom::Scale(1, -1)); + Geom::Affine itemTransform (Geom::Scale(1, -1)); /// @fixme hardcoded doc2dt transform? itemTransform = itemTransform * (Geom::Affine)item->transform; itemTransform = itemTransform * Geom::Scale(1, -1); return itemTransform; -- cgit v1.2.3 From 72cc39b9f0b340548f395c7f61ca9662b34aea09 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 11:04:37 +0200 Subject: Refactor SPItem bounding box methods: remove NRRect usage and make code using them more obvious. Fix filter region computation. (bzr r10582.1.1) --- src/extension/internal/odf.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/extension/internal/odf.cpp') diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 568c804a0..735c57798 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -573,7 +573,7 @@ void SingularValueDecomposition::calculate() //double eps = pow(2.0,-52.0); //double tiny = pow(2.0,-966.0); //let's just calculate these now - //a double can be e ± 308.25, so this is safe + //a double can be e ± 308.25, so this is safe double eps = 2.22e-16; double tiny = 1.6e-291; while (p > 0) { @@ -965,15 +965,10 @@ static Geom::Affine getODFTransform(const SPItem *item) */ static Geom::OptRect getODFBoundingBox(const SPItem *item) { - Geom::OptRect bbox_temp = ((SPItem *)item)->getBboxDesktop(); - Geom::OptRect bbox; - if (bbox_temp) { - bbox = *bbox_temp; - double doc_height = SP_ACTIVE_DOCUMENT->getHeight(); - Geom::Affine doc2dt_tf = Geom::Affine(Geom::Scale(1.0, -1.0)); - doc2dt_tf = doc2dt_tf * Geom::Affine(Geom::Translate(0, doc_height)); - bbox = *bbox * doc2dt_tf; - bbox = *bbox * Geom::Affine(Geom::Scale(pxToCm)); + // TODO: geometric or visual? + Geom::OptRect bbox = ((SPItem *)item)->documentVisualBounds(); + if (bbox) { + *bbox *= Geom::Affine(Geom::Scale(pxToCm)); } return bbox; } -- cgit v1.2.3 From 47b55c0d9fccf3994f86fd764cefca3a2f734dbe Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sat, 15 Oct 2011 22:03:44 +0200 Subject: cppcheck (bzr r10678) --- src/extension/internal/odf.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/extension/internal/odf.cpp') diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 735c57798..2c6a1a80b 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -1161,7 +1161,7 @@ bool OdfOutput::writeManifest(ZipFile &zf) outs.printf(" \n"); outs.printf(" \n"); std::map::iterator iter; - for (iter = imageTable.begin() ; iter!=imageTable.end() ; iter++) + for (iter = imageTable.begin() ; iter!=imageTable.end() ; ++iter) { Glib::ustring oldName = iter->first; Glib::ustring newName = iter->second; @@ -1241,7 +1241,7 @@ bool OdfOutput::writeMeta(ZipFile &zf) outs.printf(" %#s\n", creator.c_str()); outs.printf(" %#s\n", date.c_str()); - for (iter = metadata.begin() ; iter != metadata.end() ; iter++) + for (iter = metadata.begin() ; iter != metadata.end() ; ++iter) { Glib::ustring name = iter->first; Glib::ustring value = iter->second; @@ -1303,7 +1303,7 @@ bool OdfOutput::writeStyle(ZipFile &zf) */ outs.printf("\n"); std::vector::iterator iter; - for (iter = styleTable.begin() ; iter != styleTable.end() ; iter++) + for (iter = styleTable.begin() ; iter != styleTable.end() ; ++iter) { outs.printf("name.c_str()); StyleInfo s(*iter); @@ -1331,7 +1331,7 @@ bool OdfOutput::writeStyle(ZipFile &zf) outs.printf("\n"); outs.printf("\n"); std::vector::iterator giter; - for (giter = gradientTable.begin() ; giter != gradientTable.end() ; giter++) + for (giter = gradientTable.begin() ; giter != gradientTable.end() ; ++giter) { GradientInfo gi(*giter); if (gi.style == "linear") @@ -1583,7 +1583,7 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item, //Look for existing identical style; bool styleMatch = false; std::vector::iterator iter; - for (iter=styleTable.begin() ; iter!=styleTable.end() ; iter++) + for (iter=styleTable.begin() ; iter!=styleTable.end() ; ++iter) { if (si.equals(*iter)) { @@ -1701,7 +1701,7 @@ bool OdfOutput::processGradient(Writer &outs, SPItem *item, //Look for existing identical style; bool gradientMatch = false; std::vector::iterator iter; - for (iter=gradientTable.begin() ; iter!=gradientTable.end() ; iter++) + for (iter=gradientTable.begin() ; iter!=gradientTable.end() ; ++iter) { if (gi.equals(*iter)) { -- cgit v1.2.3 From 2633767789e4264b13ef91a684accf734fb4e94f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 26 Oct 2011 21:55:51 -0700 Subject: Fixing more broken and split doc comments. (bzr r10697) --- src/extension/internal/odf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/extension/internal/odf.cpp') diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 2c6a1a80b..3e0afdd8e 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -1,4 +1,4 @@ -/** +/* * OpenDocument input and output * * This is an an entry in the extensions mechanism to begin to enable -- cgit v1.2.3