Preparation for release of version 0.9.6

Author: utelle

docs/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.10
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -38,7 +38,7 @@ PROJECT_NAME           = wxPdfDocument
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.9.5
+PROJECT_NUMBER         = 0.9.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -303,6 +303,15 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -749,6 +758,12 @@ WARN_IF_DOC_ERROR      = YES
 
 WARN_NO_PARAMDOC       = YES
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -797,8 +812,8 @@ INPUT_ENCODING         = UTF-8
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
-# *.vhdl, *.ucf, *.qsf, *.as and *.js.
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.d \
                          *.ii \
@@ -901,6 +916,10 @@ IMAGE_PATH             =
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           = 
 
@@ -910,6 +929,10 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        = 
 
@@ -1027,7 +1050,7 @@ VERBATIM_HEADERS       = NO
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
+# generated with the -Duse-libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
@@ -1771,6 +1794,14 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -2364,6 +2395,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      = 
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      = 
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 

include/wx/pdfdocdef.h

@@ -69,16 +69,19 @@ Or you can send a mail to the author
 \section version Version history
 
 <dl>
-<dt><b>0.9.6</b> - <i>January 2017</i></dt>
+<dt><b>0.9.6</b> - <i>April 2017</i></dt>
 <dd>
 wxPdfDocument is compatible with wxWidgets version 2.8.12 and version 3.1.0.
 
 General changes:<br>
 - Overhauled the build system
 - Added continuous integration (Travis CI)
 - Replaced all occurrences of macro \b wxT by \b wxS
+- Added version information as Windows resource for DLL builds on Windows
 
 Fixed bugs:<br>
+- Fixed adjustment of angles in method wxPdfDocument::Ellipse
+- Fixed issue with drawing arcs from wxPdfDC by forcing angles into proper range for counter-clockwise drawing
 - Replaced MD5 implementation to resolve a license incompatibility issue
 - Replaced image in transparency sample to resolve a potential license issue
 

include/wx/pdfdocument.h

@@ -1522,7 +1522,7 @@ class WXDLLIMPEXP_PDFDOC wxPdfDocument
   * If a transparent colour is defined, it will be taken into account (but will be only interpreted
   * by Acrobat 4 and above).
   *
-  * For GIF, all flavors the wsWidgets GIF decoder is able to handle are supported
+  * For GIF, all flavors the wxWidgets GIF decoder is able to handle are supported
   *
   * For WMF: WMF files contain vector data described in terms of Windows Graphics Device Interface
   * (GDI) commands. There are approximately 80 different GDI commands allowed for in the WMF standard.
@@ -1591,7 +1591,7 @@ class WXDLLIMPEXP_PDFDOC wxPdfDocument
 
   /**
   * Prepares an image for use as an image mask
-  * The image is given as the name of the file conatining the image
+  * The image is given as the name of the file containing the image
   * \param file Name of the file containing the image.
   * \param mimeType Image format. Possible values are: image/jpeg, image/png, image/gif, image/wmf.
   * \return id of the image mask, or 0 in case of an error
@@ -2575,6 +2575,16 @@ class WXDLLIMPEXP_PDFDOC wxPdfDocument
                       int align = wxPDF_ALIGN_LEFT, int fill = 0, 
                       const wxPdfLink& link = wxPdfLink(-1));
 
+  /// Get size of an image
+  /**
+  * The size of the image is determined from the given graphics file.
+  *
+  * \param file Name of the file containing the image.
+  * \param mimeType Image format. Possible values are: image/jpeg, image/png, image/gif, image/wmf.
+  * \return width and height of the image
+  */
+  virtual wxSize GetImageSize(const wxString& file, const wxString& mimeType = wxEmptyString);
+
   /// Start document
   virtual void BeginPage(int orientation, wxSize pageSize);
 

src/pdfdocument.cpp

@@ -1628,6 +1628,22 @@ wxPdfDocument::WriteGlyphArray(wxPdfArrayDouble& x, wxPdfArrayDouble& y, wxPdfAr
   return ok;
 }
 
+wxSize
+wxPdfDocument::GetImageSize(const wxString& file, const wxString& mimeType)
+{
+  wxSize imageSize(0, 0);
+  wxImage image(file, mimeType);
+  if (image.IsOk())
+  {
+#if wxCHECK_VERSION(2,9,0)
+    imageSize = image.GetSize();
+#else
+    imageSize.Set(image.GetWidth(), image.GetHeight());
+#endif
+  }
+  return imageSize;
+}
+
 bool
 wxPdfDocument::Image(const wxString& file, double x, double y, double w, double h,
                      const wxString& type, const wxPdfLink& link, int maskImage)

src/pdfxml.cpp

@@ -942,15 +942,23 @@ wxPdfDocument::PrepareXmlCell(wxXmlNode* node, wxPdfCellContext& context)
       wxString src = GetXmlAttribute(child, wxS("src"), wxS(""));
       if (src.Length() > 0)
       { 
-//        long width;
+        wxSize imageSize = GetImageSize(src);
+        double wImage = ((double) imageSize.GetWidth()) / (GetImageScale() * GetScaleFactor());
+        double hImage = ((double)imageSize.GetHeight()) / (GetImageScale() * GetScaleFactor());
+        long width;
         long height;
-//        wxString strWidth = child->GetPropVal(wxS("width"), wxS("0"));
+        wxString strWidth = GetXmlAttribute(child, wxS("width"), wxS("0"));
         wxString strHeight = GetXmlAttribute(child, wxS("height"), wxS("0"));
-//        if (!strWidth.ToLong(&width)) width = 0;
+        if (!strWidth.ToLong(&width)) width = 0;
         if (!strHeight.ToLong(&height)) height = 0;
+        double w = ((double) width) / (GetImageScale() * GetScaleFactor());
         double h = ((double) height) / (GetImageScale() * GetScaleFactor());
         // TODO: handle image
         // line height, position, margins etc.
+        if (h <= 0 && wImage > 0)
+        {
+          h = (w <= 0) ? hImage : hImage * (w / wImage);
+        }
         context.AddHeight(h);
       }
     }
@@ -1590,6 +1598,9 @@ wxPdfDocument::WriteXmlCell(wxXmlNode* node, wxPdfCellContext& context)
       wxString src = GetXmlAttribute(child, wxS("src"), wxS(""));
       if (src.Length() > 0)
       { 
+        wxSize imageSize = GetImageSize(src);
+        double wImage = ((double) imageSize.GetWidth()) / (GetImageScale() * GetScaleFactor());
+        double hImage = ((double) imageSize.GetHeight()) / (GetImageScale() * GetScaleFactor());
         long width;
         long height;
         wxString strWidth = GetXmlAttribute(child, wxS("width"), wxS("0"));
@@ -1600,6 +1611,14 @@ wxPdfDocument::WriteXmlCell(wxXmlNode* node, wxPdfCellContext& context)
         double y = GetY();
         double w = ((double) width) / (GetImageScale() * GetScaleFactor());
         double h = ((double) height) / (GetImageScale() * GetScaleFactor());
+        if (width <= 0 && wImage > 0)
+        {
+          w = (height <= 0) ? wImage : wImage * (h / hImage);
+        }
+        if (height <= 0 && wImage > 0)
+        {
+          h = (width <= 0) ? hImage : hImage * (w / wImage);
+        }
         wxString align = GetXmlAttribute(child, wxS("align"), wxS("left")).Lower();
         double delta;
         if (align == wxS("right"))

wxpdfdoc.pc.in

@@ -1,9 +1,12 @@
+# Package Information for pkg-config
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@
+wxver=@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@
 
-Name: wxPdfDocument
+Name: wxPdfDocument-@WX_VERSION_MAJOR@.@WX_VERSION_MINOR@
 Description: Generation of PDF documents from wxWidgets applications
 URL: https://github.com/utelle/wxpdfdoc/
 Version: @PACKAGE_VERSION@