summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2006-01-29 05:00:31 +0000
committerMurray Cumming <murrayc@murrayc.com>2006-01-29 05:00:31 +0000
commitbbfb66f4568f68e1c62e6302e699619f9debac7f (patch)
treecc0d5084ed9e1b29fdad9f3eedef9945e62886d5
parent7adebabf4e6b0a741ee883865f8d94de7dee5ecb (diff)
2006-01-27 Jonathon Jongsma <jonathon.jongsma@gmail.com>
* .cvsignore: * cairomm/.cvsignore: update .cvsignore files * cairomm/surface.cc: * cairomm/surface.h: change Surface::create function to take a RefPtr<Surface> instead of Surface&
-rw-r--r--.cvsignore4
-rw-r--r--ChangeLog8
-rw-r--r--cairomm/.cvsignore4
-rw-r--r--cairomm/surface.cc4
-rw-r--r--cairomm/surface.h2
5 files changed, 16 insertions, 6 deletions
diff --git a/.cvsignore b/.cvsignore
index 2ab3200..eb5ce7a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,6 +6,4 @@ config.log
config.status
configure
libtool
-libxml++-2.6.pc
-libxml++.spec
-
+cairomm-1.0.pc
diff --git a/ChangeLog b/ChangeLog
index 3ab8b8d..78f7242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
0.5.0:
+2006-01-27 Jonathon Jongsma <jonathon.jongsma@gmail.com>
+
+ * .cvsignore:
+ * cairomm/.cvsignore: update .cvsignore files
+ * cairomm/surface.cc:
+ * cairomm/surface.h: change Surface::create function to take a
+ RefPtr<Surface> instead of Surface&
+
2006-01-27 Murray Cumming <murrayc@murrayc.com>
* examples/pdf-surface/Makefile.am: Remove extra LDADD that was breaking
diff --git a/cairomm/.cvsignore b/cairomm/.cvsignore
index 3dda729..587e7b3 100644
--- a/cairomm/.cvsignore
+++ b/cairomm/.cvsignore
@@ -1,2 +1,6 @@
Makefile.in
Makefile
+*.lo
+*.la
+.deps
+.libs
diff --git a/cairomm/surface.cc b/cairomm/surface.cc
index a96f872..2b4bdc6 100644
--- a/cairomm/surface.cc
+++ b/cairomm/surface.cc
@@ -99,9 +99,9 @@ void Surface::unreference() const
cairo_surface_destroy(m_cobject);
}
-RefPtr<Surface> Surface::create(const Surface& other, Content content, int width, int height)
+RefPtr<Surface> Surface::create(const RefPtr<Surface> other, Content content, int width, int height)
{
- cairo_surface_t* cobject = cairo_surface_create_similar(other.m_cobject, (cairo_content_t)content, width, height);
+ cairo_surface_t* cobject = cairo_surface_create_similar(other->m_cobject, (cairo_content_t)content, width, height);
check_status_and_throw_exception(cairo_surface_status(cobject));
return RefPtr<Surface>(new Surface(cobject, true /* has reference */));
}
diff --git a/cairomm/surface.h b/cairomm/surface.h
index e8a296a..71ef2b6 100644
--- a/cairomm/surface.h
+++ b/cairomm/surface.h
@@ -193,7 +193,7 @@ public:
* @param height height of the new surface (in device-space units)
* @return a RefPtr to the newly allocated surface.
*/
- static RefPtr<Surface> create(const Surface& other, Content content, int width, int height);
+ static RefPtr<Surface> create(const RefPtr<Surface> other, Content content, int width, int height);
protected:
/** The underlying C cairo surface type that is wrapped by this Surface