Skip to content
Snippets Groups Projects
  1. Jul 06, 2010
  2. Jun 07, 2010
    • Daniel Elstner's avatar
      Disallow copying of Cairo::Context objects · 83bb42f4
      Daniel Elstner authored
      * cairomm/context.h (Cairo::Context): Declare a private copy
      constructor and assignment operator in order to explicitly prevent
      objects from being copied by value.  That was never valid, and not
      disallowing it seems to have been merely an oversight.
      83bb42f4
    • Daniel Elstner's avatar
      Do not unnecessarily cast booleans to pointers · 2dbde903
      Daniel Elstner authored
      * cairomm/fontface.cc (USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS): Put
      dummy object into an anonymous namespace and make it static.
      (UserFontFace::text_to_glyphs): Do not cast a boolean to a pointer
      in order to indicate state via the font face's user data.  There are
      fairly safe alternative casts to do this, but it is much simpler to
      just take the address of any existing object to get a non-0 pointer.
      (UserFontFace::UserFontFace): Remove unnecessary casts.
      2dbde903
    • Armin Burgmeier's avatar
      Fix the build with MSVC · a73f9a84
      Armin Burgmeier authored and Murray Cumming's avatar Murray Cumming committed
      2009-10-26  Armin Burgmeier  <armin@arbur.net>
      
      	* MSVC_Net2005/cairomm/cairomm.rc.in:
      	* MSVC_Net2008/cairomm/cairomm.rc.in: Replaced GENERIC_MAJOR_VERSION
      	et al. by CAIROMM_MAJOR_VERSION, so that they are properly replaced
      	during configure.
      
      	* MSVC_Net2005/examples/image-surface/image-surface.vcproj:
      	* MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj:
      	* MSVC_Net2005/examples/ps-surface/ps-surface.vcproj:
      	* MSVC_Net2005/examples/svg-surface/svg-surface.vcproj:
      	* MSVC_Net2005/examples/text-rotate/text-rotate.vcproj:
      	* MSVC_Net2005/examples/toy-text/toy-text.vcproj:
      	* MSVC_Net2005/examples/user-font/user-font.vcproj:
      	* MSVC_Net2008/examples/image-surface/image-surface.vcproj:
      	* MSVC_Net2008/examples/pdf-surface/pdf-surface.vcproj:
      	* MSVC_Net2008/examples/ps-surface/ps-surface.vcproj:
      	* MSVC_Net2008/examples/svg-surface/svg-surface.vcproj:
      	* MSVC_Net2008/examples/text-rotate/text-rotate.vcproj:
      	* MSVC_Net2008/examples/toy-text/toy-text.vcproj:
      	* MSVC_Net2008/examples/user-font/user-font.vcproj: Added
      	$(SolutionDir)/cairomm to the include search paths, so that
      	cairommconfig.h is found even if configure did not run.
      
      	* cairomm/fontface.cc: MSVC does not allow to reinterpret_cast a bool
      	to void*, so use an int instead.
      
      	* cairomm/context.cc:
      	* examples/surfaces/image-surface.cc:
      	* examples/surfaces/pdf-surface.cc:
      	* examples/surfaces/ps-surface.cc:
      	* examples/surfaces/svg-surface.cc:
      	* examples/text/text-rotate.cc: Define _USE_MATH_DEFINES before
      	including anything, to make sure we get the defines even if math.h
      	is included indirectly via another header.
      a73f9a84
    • Augusto Jun Devegili's avatar
      Put ifdefs around 32-bit-only API, to fix the build on 64-bit machines. · c5c7c6db
      Augusto Jun Devegili authored and Murray Cumming's avatar Murray Cumming committed
      * cairomm/quartz_font.[h|cc]: Use #ifndef __LP64__, as cairo does.
      c5c7c6db
    • Murray Cumming's avatar
      Fix the ChangeLog. · 0db0ebee
      Murray Cumming authored
      0db0ebee
    • Murray Cumming's avatar
      Actually install cairomm-xlib-xrender-1.0.pc. · 38c753a9
      Murray Cumming authored
      * configure.ac: Fix a typo in the check for xlib-xrender support in
          cairo. Fixes bug #27066.
      38c753a9
  3. Apr 19, 2010
    • Daniel Elstner's avatar
      Clean up configure.ac and add silent rules support · 17e328e6
      Daniel Elstner authored
      * configure.ac (AC_INIT): Specify correct URLs for bug reports and the
      project home page.
      (AM_SILENT_RULES): Call macro if defined.
      (MM_PREREQ): Require mm-common 0.8.
      (BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB): Rewrite the fragile shell code
      of the boost check.
      17e328e6
  4. Oct 19, 2009
  5. Aug 13, 2009
    • Jonathon Jongsma's avatar
      Don't force tests to be enabled when CAIROMM_DEVEL is defined · fcfb0116
      Jonathon Jongsma authored
      This was hacked in to ensure that I always built with tests enabled, but the
      boost configure detection scripts are broken right now on my setup, so this just
      hinders my ability to get things done.  remove it.
      fcfb0116
    • Daniel Elstner's avatar
      Distribute mm-common documentation utilities · 342cd11c
      Daniel Elstner authored
      * docs/Makefile.am (dist_noinst_DATA): List the utility scripts
      installed by mm-common-prepare here, so they will be distributed.
      342cd11c
    • Daniel Elstner's avatar
      Add missing call to MM_CONFIG_DOCTOOL_DIR · 7bab5000
      Daniel Elstner authored
      * configure.ac: Call MM_CONFIG_DOCTOOL_DIR([docs]) to indicate to
      mm-common-prepare that this module cannot depend on the utilities
      shipped with glibmm, and needs its own copies.
      7bab5000
    • Daniel Elstner's avatar
      Fix left-over cairomm/cairommconfig.h includes · b6551397
      Daniel Elstner authored
      * cairomm/cairomm.h: Remove directory prefix from cairommconfig.h
      include statement.
      * cairomm/context.cc: Include <cmath> unconditionally instead of
      conditionally including <math.h>.
      * examples/surfaces/*.cc: ditto,
      * examples/text/text-rotate.cc: ditto.
      b6551397
    • Daniel Elstner's avatar
      Review and clean up after build overhaul · cbed810a
      Daniel Elstner authored
      * autogen.sh: Pass --enable-maintainer-mode to ./configure since the
      automatic rebuild of the reference documentation is only enabled in
      maintainer mode.  AM_MAINTAINER_MODE is already in configure.ac.
      * configure.ac (AC_CONFIG_HEADERS): Prepend build/config.h to the
      list of header files, because the first file in the list has its .in
      file generated by autoheader, and will thus include every AC_DEFINE
      from every Autoconf macro that is used.  The macros defined in the
      installed cairommconfig.h header should be namespaced and limited to
      meta information about the installed cairomm library.
      Also move cairommconfig.h to the top-level directory, in order to
      avoid the need to add the cairomm/ subdirectory to the include path.
      (PKG_CHECK_MODULES): Collapse the checks for optional cairo modules
      into a loop, and use PKG_CHECK_EXISTS() instead of the full-blown
      PKG_CHECK_MODULES().  Also, be a bit cleverer about the lists of .pc
      files and module names generated along the way.
      (AC_CONFIG_FILES): List all potentially installed files literally,
      instead of creating the list of output files dynamically.  This is
      much simpler and also gets us free shipping.  Remove data/Makefile.
      * cairommconfig.h.in: Add file to repository, as it should not be
      autogenerated.  Of the content, keep only the CAIROMM_ namespaced
      macros.
      * cairomm/context*.cc: Remove cairomm/ prefix from cairommconfig.h
      include statements.  This was already wrong before, but moving the
      file around made it visible.
      * Makefile.am: Clean up a bit.
      (DIST_SUBDIRS): Have Automake figure it out automatically.
      (cairomm_include_HEADERS): Remove, as cairomm/cairomm.h is already
      installed in cairomm/Makefile.am.
      (nodist_cairomm_libinclude_HEADERS): Relocate cairommconfig.h to
      the top-level directory.
      (nodist_pkgconfig_DATA): Use $(CAIROMM_INSTALL_PC) substitution from
      configure.ac to install the appropriate pkg-config data files.
      * cairomm/Makefile.am: Rewrite without using compile-binding.am, as
      it is not really the appropriate tool for the cairomm job.
      * cairomm/filelist.am (cairomm_cc): Rename from $(files_extra_cc).
      (cairomm_public_h): Rename variable from $(files_extra_h) and remove
      cairommconfig.h from the list.
      (cairomm_private_h): Rename variable from $(files_extra_ph).
      * docs/Makefile.am (doc_input): Adjust variable names.
      (dist_noinst_DATA): Add reference/cairomm.css to the list.
      (pubdocbase): Define for completeness.
      (htmlrefpub): Correct documentation URL.
      * docs/Doxyfile.in: Strip trailing whitespace from every line.
      (STRIP_FROM_PATH), (STRIP_FROM_INC_PATH), (INCLUDE_PATH): Do not
      strip the cairomm/ subdirectory prefix from the displayed filenames.
      (EXCLUDE): Remove list of files to exclude, since the list of input
      files is specified explicitly with the new build organization.
      (EXPAND_AS_DEFINED): Expand version number macros, although at the
      moment they are probably not used anywhere in the public headers.
      * data/cairomm-*.pc.in: Use @PACKAGE_VERSION@ instead of @VERSION@.
      * data/cairomm-1.0.pc.in (htmlrefpub): Correct documentation URL.
      (Cflags): Add missing -I${libdir}/@CAIROMM_MODULE_NAME@/include.
      * data/Makefile.am: Delete now unused build file.
      * docs/reference/Makefile.am: Delete left-over build file.
      cbed810a
    • David King's avatar
      Get rid of all Makefile.am in the MSVC dirs · d4000533
      David King authored
      * MSVC_Net2005/**/.cvsignore:
      * MSVC_Net2008/**/.cvsignore: Remove obsolete .cvsignore files.
      * MSVC_Net2005/**/Makefile.am:
      * MSVC_Net2008/**/Makefile.am: Remove recursive build files.
      * MSVC_Net2005/filelist.am:
      * MSVC_Net2008/filelist.am: Recursively list all files that should go
      into the distribution.
      * configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs to the
      MSVC subdirectories.
       (AC_CONFIG_COMMANDS): Copy the configuration header files into the
      MSVC subdirectories by making config.status execute custom
      configuration commands. This is easier than doing it at the Makefile
      level, where it was previously implemented.
      * Makefile.am: Include the filelist.am files from the MSVC
      subdirectories.
       (SUBDIRS): Remove MSVC_Net200[58] directories from the list.
       (dist_noinst_DATA): Distribute the MSVC project files.
       (DISTCLEANFILES): Include the copied configuration header files in a
       distclean.
      d4000533
    • David King's avatar
      Switch to mm-common documentation build infrastructure · de4e75a5
      David King authored
      * .gitignore: Add new generated documentation files.
      * Makefile.am: Remove old documentation generation build.
      * configure.ac:
      * docs/reference/Makefile.am: Remove, with switch to non-recursive
      documentation build.
      * data/cairomm-1.0.pc.in:
      * docs/Makefile.am: Switch to new documentation build infrastructure
      from mm-common.
      * docs/reference/Doxyfile.in: Modernise and disable several unused
      features of the Doxygen output.
      de4e75a5
    • David King's avatar
      Simplify build system of examples and cairomm subdirectores · 06de63b1
      David King authored
      * .gitignore: Add INSTALL, mm-common *.am files and .dirstamp.
      * Makefile.am: Change VERSION to PACKAGE_VERSION. Begin transition
      to use of new build infrastructure.
      * cairomm/Makefile.am: Simplify by moving significant portions to
      toplevel Makefile.am.
      * cairomm/filelist.am: List of files for libcairomm. Move private
      source files to files_extra_cc.
      * configure.ac: Use MM_INIT_MODULE and remove example subdirectory
      Makefile.am.
      * examples/surfaces/Makefile.am:
      * examples/text/Makefile.am: Remove.
      * examples/Makefile.am: Convert examples tree to non-recursive
      build, with single, slimmer Makefile.am.
      06de63b1
    • David King's avatar
      Initial changes to ease transition to mm-common build infrastructure · bec00742
      David King authored
      * autogen.sh: Replace with a simple wrapper around mm-common-prepare
      and autoreconf.
      * build/*.m4: Move from m4 directory.
      * Makefile.am: Rename m4 directory to build.
      * configure.ac: Rename from configure.in, as it is recommended by
      Autoconf developers and currently required by mm-common-prepare. Major
      update to take advantage of mm-common build infrastructure.
      * INSTALL: Remove from repository, using GNU install instructions
      instead.
      * cairomm/Makefile.am: Remove unnecessary win32 conditionals.
      bec00742
  6. Aug 08, 2009
  7. Jul 08, 2009
  8. Jul 06, 2009
  9. Jul 05, 2009
  10. Jan 27, 2009
  11. Jan 20, 2009
    • Jonathon Jongsma's avatar
      Fix documentation of ImageSurface::create() · 9a1f291a
      Jonathon Jongsma authored
      	* cairomm/surface.h: fixed the documentation for ImageSurface::create() to
      	match the cairo C documentation (it must have changed since we initially
      	copied the documentation -- it'd really be nice to have a way to automatically
      	generate the C++ documentation...)
      9a1f291a
  12. Dec 20, 2008
    • Jonathon Jongsma's avatar
      fix some distcheck failures · 72bfac8b
      Jonathon Jongsma authored
      v1.7.2
      72bfac8b
    • Jonathon Jongsma's avatar
      Update NEWS and bump version to 1.7.2 · 45417649
      Jonathon Jongsma authored
      45417649
    • Jonathon Jongsma's avatar
      scaled_matrix() -> scaling_matrix() · 87a5ddbd
      Jonathon Jongsma authored
      87a5ddbd
    • Armin Burgmeier's avatar
      Updated MSVC project files · 31fbb2f0
      Armin Burgmeier authored
      2008-12-20  Armin Burgmeier  <armin@openismus.com>
      
      	* cairomm/pattern.h: Forward-declared Matrix as a class instead of as
      	a struct, to prevent MSVC from complaining about "'Cairo::Matrix' :
      	type name first seen using 'struct' now seen using 'class'".
      
      	* MSVC_Net2005/examples/png_file:
      	* MSVC_Net2008/examples/png_file: Removed, as the corresponding
      	example has been removed.
      
      	* MSVC_Net2005/cairomm/cairomm.vcproj:
      	* MSVC_Net2008/cairomm/cairomm.vcproj: Link against libsigc++, added
      	matrix.h, win32_font.h, matrix.cc and win32_font.cc to the project.
      
      	* MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj:
      	* MSVC_Net2005/examples/ps-surface/ps-surface.vcproj:
      	* MSVC_Net2005/examples/svg-surface/svg-surface.vcproj:
      	* MSVC_Net2005/examples/pdf-surface/pdf-surface.vcproj:
      	* MSVC_Net2008/examples/ps-surface/ps-surface.vcproj:
      	* MSVC_Net2008/examples/svg-surface/svg-surface.vcproj:
      	* MSVC_Net2008/examples/text-rotate/text-rotate.vcproj:
      	* MSVC_Net2008/examples/text-rotate/text-rotate.vcproj: Adapt path to
      	source files.
      
      	* MSVC_Net2005/examples/image-surface/image-surface.vcproj:
      	* MSVC_Net2005/examples/image-surface/Makefile.am:
      	* MSVC_Net2005/examples/toy-text/toy-text.vcproj:
      	* MSVC_Net2005/examples/toy-text/Makefile.am:
      	* MSVC_Net2005/examples/user-font/user-font.vcproj:
      	* MSVC_Net2005/examples/user-font/Makefile.am:
      	* MSVC_Net2005/examples/Makefile.am: Added MSVC2005 projects for these
      	examples.
      
      	* MSVC_Net2008/examples/image-surface/image-surface.vcproj:
      	* MSVC_Net2008/examples/image-surface/Makefile.am:
      	* MSVC_Net2008/examples/toy-text/toy-text.vcproj:
      	* MSVC_Net2008/examples/toy-text/Makefile.am:
      	* MSVC_Net2008/examples/user-font/user-font.vcproj:
      	* MSVC_Net2008/examples/user-font/Makefile.am:
      	* MSVC_Net2008/examples/Makefile.am: Added MSVC2008 projects for these
      	examples.
      
      	* MSVC_Net2005/cairomm.sln:
      	* MSVC_Net2008/cairomm.sln: Added the new example projects to the
      	corresponding solution.
      
      	* configure.in: Create Makefiles in the newly added directories.
      31fbb2f0
  13. Dec 15, 2008
    • Jonathon Jongsma's avatar
      Revert virtual ScaledFont destructor (no ABI break) · 60e51c30
      Jonathon Jongsma authored
      	* cairomm/scaledfont.h: revert the virtual destructor since it's unnecessary
      	and an ABI change.  The ScaledFont subclasses don't have any virtual functions
      	or any subclass-specific data that needs to be cleaned up, so a virtual
      	destructor is not really necessary here.
      	* tests/test-scaled-font.cc: a little paranoia test just to ensure that the
      	base destructor is called correctly reducing the ref count when we delete a
      	FtFontFace
      60e51c30
    • Jonathon Jongsma's avatar
      Add tests and fix a bug in UserFontFace · 0fc70d99
      Jonathon Jongsma authored
      	* cairomm/fontface.cc: fixed a bug in UserFont where I was incorrectly using a
      	function static variable and so it was not returning negative numbers for
      	num_glyphs when I expected it to
      	* tests/Makefile.am:
      	* tests/test-font-face.cc:
      	* tests/test-user-font.cc: Added tests for UserFontFace
      0fc70d99
    • Jonathon Jongsma's avatar
      Really fix ScaledFont::get_font_face() bug · 3a2c3217
      Jonathon Jongsma authored
      	* cairomm/scaledfont.cc: actually fix a reference-counting issue with
      	ScaledFont::get_font_face() that I thought I had fixed in b1d01ff7
      	* tests/test-scaled-font.cc: add a test for the get_font_face() bug
      3a2c3217
  14. Dec 13, 2008
    • Jonathon Jongsma's avatar
      update ignores again · 53ae1a41
      Jonathon Jongsma authored
      53ae1a41
    • Jonathon Jongsma's avatar
    • Jonathon Jongsma's avatar
      Cross-reference typedef-ed structs · 3bf8d865
      Jonathon Jongsma authored
      	* cairomm/types.h: add cross-reference links to the cairo manual for all types
      	that are just typedefs of C structs
      3bf8d865
    • Jonathon Jongsma's avatar
      Minor changes to text-rotate example · 6000e9a2
      Jonathon Jongsma authored
      	* .gitignore: ignore the new example executable names
      	* examples/text/Makefile.am: normalize the text-rotate example
      	executable name
      	* examples/text/text-rotate.cc: print a message to the terminal explaining
      	that a file was written
      6000e9a2
    • Jonathon Jongsma's avatar
      2dba9ab3
    • Jonathon Jongsma's avatar
      Restructure examples directory · dd87203f
      Jonathon Jongsma authored
      	Restructure the examples directory so that there aren't so many subdirs, which
      	tends to slow down builds since they can't be done in parallel.  Also
      	'standardize' the executable names a bit more and give the source files
      	meaningful names rather than 'main.cc' or similar
      
      	* configure.in:
      	* examples/.cvsignore: Removed.
      	* examples/Makefile.am:
      	* examples/README:
      	* examples/pdf-surface/.cvsignore: Removed.
      	* examples/pdf-surface/Makefile.am: Removed.
      	* examples/png_file/.cvsignore: Removed.
      	* examples/png_file/Makefile.am: Removed.
      	* examples/ps-surface/.cvsignore: Removed.
      	* examples/ps-surface/Makefile.am: Removed.
      	* examples/surfaces/image-surface.cc: Renamed from examples/png_file/main.cc.
      	* examples/surfaces/pdf-surface.cc: Renamed from examples/pdf-surface/main.cc.
      	* examples/surfaces/ps-surface.cc: Renamed from examples/ps-surface/main.cc.
      	* examples/surfaces/svg-surface.cc: Renamed from examples/svg-surface/main.cc.
      	* examples/svg-surface/.cvsignore: Removed.
      	* examples/svg-surface/Makefile.am: Removed.
      dd87203f
  15. Dec 12, 2008
Loading