X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=d01e07535ca001608a52738be910b1e15336f36d;hp=f8a17964cd24b1b5173e733d1207ed5d14efd99f;hb=180d764223a3568f734434a15d56f18e9ddc012b;hpb=c4f8f7c6c7e43fc9fd5358197ca866b4186f636c diff --git a/src/document.cpp b/src/document.cpp index f8a1796..d01e075 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1145,28 +1145,43 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca stbtt_FreeShape(font, instructions); } -void Document::TransformObjectBounds(const SVGMatrix & transform) +void Document::TransformObjectBounds(const SVGMatrix & transform, ObjectType type) { + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.m_bounds.x = transform.a * p.m_bounds.x + transform.e; + p.m_bounds.y = transform.d * p.m_bounds.y + transform.f; + p.m_bounds.w *= transform.a; + p.m_bounds.h *= transform.d; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { - TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform); - m_objects.bounds[i].w *= transform.a; - m_objects.bounds[i].h *= transform.d; + if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type) + { + TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform); + m_objects.bounds[i].w *= transform.a; + m_objects.bounds[i].h *= transform.d; + } } } void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type) { #ifdef TRANSFORM_BEZIERS_TO_PATH - for (unsigned i = 0; i < m_objects.paths.size(); ++i) - { - Path & p = m_objects.paths[i]; - p.m_bounds.x += dx; - p.m_bounds.y += dy; - } - return; - #endif - + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.m_bounds.x += dx; + p.m_bounds.y += dy; + } + return; + #endif + for (unsigned i = 0; i < m_count; ++i) { if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)