summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-02-01 18:39:38 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-02-01 18:39:38 +0000
commiteb1421b01e1363681241e43e609dc2f46272ded5 (patch)
treed825079cc1f21674d87ed13c3d9ab285e94dca75 /src
parentFix crash when trying to import a corrupted PNG file. (diff)
downloadinkscape-eb1421b01e1363681241e43e609dc2f46272ded5.tar.gz
inkscape-eb1421b01e1363681241e43e609dc2f46272ded5.zip
Updates for devlibs revision 9
(bzr r9041)
Diffstat (limited to 'src')
-rw-r--r--src/registrytool.cpp1
-rw-r--r--src/ui/dialog/filedialogimpl-win32.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/registrytool.cpp b/src/registrytool.cpp
index 8bc9cbebf..2017f50c7 100644
--- a/src/registrytool.cpp
+++ b/src/registrytool.cpp
@@ -27,6 +27,7 @@
#include <windows.h>
#include <string>
+#include <cstdio>
#include "registrytool.h"
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index d22a368f2..529288031 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -1373,10 +1373,10 @@ void FileOpenDialogImplWin32::render_preview()
if(_preview_bitmap_image) // Is the image a pixbuf?
{
// Set the transformation
- const Matrix matrix = {
+ const Cairo::Matrix matrix(
scaleFactor, 0,
0, scaleFactor,
- svgX, svgY };
+ svgX, svgY);
context->set_matrix (matrix);
// Render the image