diff options
author | Albert Astals Cid <aacid@kde.org> | 2009-04-11 00:31:57 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2009-04-11 00:31:57 +0200 |
commit | 9cf2325fb22f812b31858e519411f57747d39bd8 (patch) | |
tree | a3e03ba664475b379edec748d80ec75719e54678 | |
parent | c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef (diff) |
More gmalloc → gmallocn
-rw-r--r-- | glib/poppler-page.cc | 2 | ||||
-rw-r--r-- | splash/Splash.cc | 8 | ||||
-rw-r--r-- | splash/SplashBitmap.cc | 6 | ||||
-rw-r--r-- | splash/SplashFTFont.cc | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc index f1dd1336..225c97b2 100644 --- a/glib/poppler-page.cc +++ b/glib/poppler-page.cc @@ -318,3 +318,3 @@ poppler_page_prepare_output_dev (PopplerPage *page, cairo_rowstride = cairo_width * 4; - cairo_data = (guchar *) gmalloc (cairo_height * cairo_rowstride); + cairo_data = (guchar *) gmallocn (cairo_height, cairo_rowstride); if (transparent) diff --git a/splash/Splash.cc b/splash/Splash.cc index c93ef408..a1deb854 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -13,3 +13,3 @@ // -// Copyright (C) 2005-2008 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2005-2009 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> @@ -2003,3 +2003,3 @@ SplashError Splash::fillImageMask(SplashImageMaskSource src, void *srcData, // allocate pixel buffer - pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w); + pixBuf = (SplashColorPtr)gmallocn((yp + 1), w); @@ -2303,5 +2303,5 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData, // allocate pixel buffers - colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps); + colorBuf = (SplashColorPtr)gmallocn3((yp + 1), w, nComps); if (srcAlpha) { - alphaBuf = (Guchar *)gmalloc((yp + 1) * w); + alphaBuf = (Guchar *)gmallocn((yp + 1), w); } else { diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc index 97d622cf..6cf2aea9 100644 --- a/splash/SplashBitmap.cc +++ b/splash/SplashBitmap.cc @@ -13,3 +13,3 @@ // -// Copyright (C) 2006 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2006, 2009 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen@gmail.com> @@ -64,3 +64,3 @@ SplashBitmap::SplashBitmap(int widthA, int heightA, int rowPad, rowSize -= rowSize % rowPad; - data = (SplashColorPtr)gmalloc(rowSize * height); + data = (SplashColorPtr)gmallocn(rowSize, height); if (!topDown) { @@ -70,3 +70,3 @@ SplashBitmap::SplashBitmap(int widthA, int heightA, int rowPad, if (alphaA) { - alpha = (Guchar *)gmalloc(width * height); + alpha = (Guchar *)gmallocn(width, height); } else { diff --git a/splash/SplashFTFont.cc b/splash/SplashFTFont.cc index 0039feb6..c3b298af 100644 --- a/splash/SplashFTFont.cc +++ b/splash/SplashFTFont.cc @@ -245,3 +245,3 @@ GBool SplashFTFont::makeGlyph(int c, int xFrac, int yFrac, } - bitmap->data = (Guchar *)gmalloc(rowSize * bitmap->h); + bitmap->data = (Guchar *)gmallocn(rowSize, bitmap->h); bitmap->freeData = gTrue; |