From 9ac9625caf554f15c6e3262517c6dac8943390f5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 23 Jul 2012 19:54:12 +0300 Subject: [PATCH] No KillPicture() in the 10.7 SDK, so just leak for now... --- vcl/aqua/source/dtrans/PictToBmpFlt.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx index 51b294258a04..196ec2e55865 100644 --- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx +++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx @@ -118,10 +118,22 @@ bool BMPtoPICT(com::sun::star::uno::Sequence& aBmp, rtl_copyMemory(aPict.getArray(), ((sal_Int8*)*hPict), sz); HUnlock((Handle)hPict); +#if MACOSX_SDK_VERSION < 1070 // Release the data associated with the picture // Note: This function is deprecated in Mac OS X // 10.4. + + // How nice. This whole thing needs to be rewritten I guess. Or + // does this code even get invoked on current OSes? Given that + // KillPicture() was deprecated already in 10.4, back when + // somebody was actually working on this code, hopefulluy + // knowing what he/she was doing, was it really not known that + // the stuff used here is going to go away? + KillPicture(hPict); +#else + SAL_WARN("vcl", "Here we used to call the deprecated KillPicture(), no idea what to do, so leaking..."); +#endif result = true; }