diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2009-08-06 14:17:17 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2009-08-06 14:17:17 +0000 |
| commit | 51c2905fd3e99955db2d823b79abb763d8097028 (patch) | |
| tree | 90128509479f5498e1125d1e4eb9cdc05bf6b6e6 /src/color-profile.cpp | |
| parent | Adding one more control to Smart Jelly (diff) | |
| download | inkscape-51c2905fd3e99955db2d823b79abb763d8097028.tar.gz inkscape-51c2905fd3e99955db2d823b79abb763d8097028.zip | |
Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.
(bzr r8422)
Diffstat (limited to 'src/color-profile.cpp')
| -rw-r--r-- | src/color-profile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index b2487a6a9..5868a9582 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -151,7 +151,7 @@ void ColorProfile::init( ColorProfile *cprof ) void ColorProfile::release( SPObject *object ) { // Unregister ourselves - Document* document = SP_OBJECT_DOCUMENT(object); + SPDocument* document = SP_OBJECT_DOCUMENT(object); if ( document ) { sp_document_remove_resource (SP_OBJECT_DOCUMENT (object), "iccprofile", SP_OBJECT (object)); } @@ -205,7 +205,7 @@ void ColorProfile::_clearProfile() /** * Callback: set attributes from associated repr. */ -void ColorProfile::build( SPObject *object, Document *document, Inkscape::XML::Node *repr ) +void ColorProfile::build( SPObject *object, SPDocument *document, Inkscape::XML::Node *repr ) { ColorProfile *cprof = COLORPROFILE(object); g_assert(cprof->href == 0); @@ -251,7 +251,7 @@ void ColorProfile::set( SPObject *object, unsigned key, gchar const *value ) //LCMSAPI cmsHPROFILE LCMSEXPORT cmsOpenProfileFromMem(LPVOID MemPtr, DWORD dwSize); // Try to open relative - Document *doc = SP_OBJECT_DOCUMENT(object); + SPDocument *doc = SP_OBJECT_DOCUMENT(object); if (!doc) { doc = SP_ACTIVE_DOCUMENT; g_warning("object has no document. using active"); @@ -436,7 +436,7 @@ static int getLcmsIntent( guint svgIntent ) return intent; } -static SPObject* bruteFind( Document* document, gchar const* name ) +static SPObject* bruteFind( SPDocument* document, gchar const* name ) { SPObject* result = 0; const GSList * current = sp_document_get_resource_list(document, "iccprofile"); @@ -456,7 +456,7 @@ static SPObject* bruteFind( Document* document, gchar const* name ) return result; } -cmsHPROFILE Inkscape::colorprofile_get_handle( Document* document, guint* intent, gchar const* name ) +cmsHPROFILE Inkscape::colorprofile_get_handle( SPDocument* document, guint* intent, gchar const* name ) { cmsHPROFILE prof = 0; |