diff --git a/GI/GdkPixbuf.hs b/GI/GdkPixbuf.hs --- a/GI/GdkPixbuf.hs +++ b/GI/GdkPixbuf.hs @@ -149,6 +149,7 @@ let colorspace' = (fromIntegral . fromEnum) colorspace let has_alpha' = (fromIntegral . fromEnum) has_alpha result <- gdk_pixbuf_new colorspace' has_alpha' bits_per_sample width height + checkUnexpectedReturnNULL "gdk_pixbuf_new" result result' <- (wrapObject Pixbuf) result return result' @@ -187,6 +188,7 @@ let colorspace' = (fromIntegral . fromEnum) colorspace let has_alpha' = (fromIntegral . fromEnum) has_alpha result <- gdk_pixbuf_new_from_bytes data_' colorspace' has_alpha' bits_per_sample width height rowstride + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_bytes" result result' <- (wrapObject Pixbuf) result touchManagedPtr data_ return result' @@ -227,7 +229,7 @@ pixbufNewFromData data_ colorspace has_alpha bits_per_sample width height rowstride destroy_fn = liftIO $ do let colorspace' = (fromIntegral . fromEnum) colorspace let has_alpha' = (fromIntegral . fromEnum) has_alpha - ptrdestroy_fn <- callocBytes $ sizeOf (undefined :: FunPtr PixbufDestroyNotifyC) + ptrdestroy_fn <- callocMem :: IO (Ptr (FunPtr PixbufDestroyNotifyC)) maybeDestroy_fn <- case destroy_fn of Nothing -> return (castPtrToFunPtr nullPtr) Just jDestroy_fn -> do @@ -236,6 +238,7 @@ return jDestroy_fn' let destroy_fn_data = nullPtr result <- gdk_pixbuf_new_from_data data_ colorspace' has_alpha' bits_per_sample width height rowstride maybeDestroy_fn destroy_fn_data + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_data" result result' <- (wrapObject Pixbuf) result return result' @@ -262,6 +265,7 @@ filename' <- textToCString filename onException (do result <- propagateGError $ gdk_pixbuf_new_from_file filename' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_file" result result' <- (wrapObject Pixbuf) result freeMem filename' return result' @@ -299,6 +303,7 @@ let preserve_aspect_ratio' = (fromIntegral . fromEnum) preserve_aspect_ratio onException (do result <- propagateGError $ gdk_pixbuf_new_from_file_at_scale filename' width height preserve_aspect_ratio' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_file_at_scale" result result' <- (wrapObject Pixbuf) result freeMem filename' return result' @@ -333,6 +338,7 @@ filename' <- textToCString filename onException (do result <- propagateGError $ gdk_pixbuf_new_from_file_at_size filename' width height + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_file_at_size" result result' <- (wrapObject Pixbuf) result freeMem filename' return result' @@ -368,6 +374,7 @@ let copy_pixels' = (fromIntegral . fromEnum) copy_pixels onException (do result <- propagateGError $ gdk_pixbuf_new_from_inline data_length data_' copy_pixels' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_inline" result result' <- (wrapObject Pixbuf) result freeMem data_' return result' @@ -398,6 +405,7 @@ resource_path' <- textToCString resource_path onException (do result <- propagateGError $ gdk_pixbuf_new_from_resource resource_path' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_resource" result result' <- (wrapObject Pixbuf) result freeMem resource_path' return result' @@ -435,6 +443,7 @@ let preserve_aspect_ratio' = (fromIntegral . fromEnum) preserve_aspect_ratio onException (do result <- propagateGError $ gdk_pixbuf_new_from_resource_at_scale resource_path' width height preserve_aspect_ratio' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_resource_at_scale" result result' <- (wrapObject Pixbuf) result freeMem resource_path' return result' @@ -472,6 +481,7 @@ return jCancellable' onException (do result <- propagateGError $ gdk_pixbuf_new_from_stream stream' maybeCancellable + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_stream" result result' <- (wrapObject Pixbuf) result touchManagedPtr stream whenJust cancellable touchManagedPtr @@ -517,6 +527,7 @@ return jCancellable' onException (do result <- propagateGError $ gdk_pixbuf_new_from_stream_at_scale stream' width height preserve_aspect_ratio' maybeCancellable + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_stream_at_scale" result result' <- (wrapObject Pixbuf) result touchManagedPtr stream whenJust cancellable touchManagedPtr @@ -548,6 +559,7 @@ let async_result' = unsafeManagedPtrCastPtr async_result onException (do result <- propagateGError $ gdk_pixbuf_new_from_stream_finish async_result' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_stream_finish" result result' <- (wrapObject Pixbuf) result touchManagedPtr async_result return result' @@ -576,6 +588,7 @@ pixbufNewFromXpmData data_ = liftIO $ do data_' <- packZeroTerminatedUTF8CArray data_ result <- gdk_pixbuf_new_from_xpm_data data_' + checkUnexpectedReturnNULL "gdk_pixbuf_new_from_xpm_data" result result' <- (wrapObject Pixbuf) result mapZeroTerminatedCArray freeMem data_' freeMem data_' @@ -611,6 +624,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj let substitute_color' = (fromIntegral . fromEnum) substitute_color result <- gdk_pixbuf_add_alpha _obj' substitute_color' r g b + checkUnexpectedReturnNULL "gdk_pixbuf_add_alpha" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -636,6 +650,7 @@ pixbufApplyEmbeddedOrientation _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_apply_embedded_orientation _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_apply_embedded_orientation" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -792,6 +807,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj let interp_type' = (fromIntegral . fromEnum) interp_type result <- gdk_pixbuf_composite_color_simple _obj' dest_width dest_height interp_type' overall_alpha check_size color1 color2 + checkUnexpectedReturnNULL "gdk_pixbuf_composite_color_simple" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -817,6 +833,7 @@ pixbufCopy _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_copy _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_copy" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -911,6 +928,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj let horizontal' = (fromIntegral . fromEnum) horizontal result <- gdk_pixbuf_flip _obj' horizontal' + checkUnexpectedReturnNULL "gdk_pixbuf_flip" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -1085,6 +1103,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj key' <- textToCString key result <- gdk_pixbuf_get_option _obj' key' + checkUnexpectedReturnNULL "gdk_pixbuf_get_option" result result' <- cstringToText result touchManagedPtr _obj freeMem key' @@ -1116,6 +1135,7 @@ length_ <- allocMem :: IO (Ptr Word32) result <- gdk_pixbuf_get_pixels_with_length _obj' length_ length_' <- peek length_ + checkUnexpectedReturnNULL "gdk_pixbuf_get_pixels_with_length" result result' <- (unpackByteStringWithLength length_') result touchManagedPtr _obj freeMem length_ @@ -1198,6 +1218,7 @@ pixbufNewSubpixbuf _obj src_x src_y width height = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_new_subpixbuf _obj' src_x src_y width height + checkUnexpectedReturnNULL "gdk_pixbuf_new_subpixbuf" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -1223,6 +1244,7 @@ pixbufReadPixelBytes _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_read_pixel_bytes _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_read_pixel_bytes" result result' <- (wrapBoxed GLib.Bytes) result touchManagedPtr _obj return result' @@ -1275,6 +1297,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj let angle' = (fromIntegral . fromEnum) angle result <- gdk_pixbuf_rotate_simple _obj' angle' + checkUnexpectedReturnNULL "gdk_pixbuf_rotate_simple" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -1557,6 +1580,7 @@ let _obj' = unsafeManagedPtrCastPtr _obj let interp_type' = (fromIntegral . fromEnum) interp_type result <- gdk_pixbuf_scale_simple _obj' dest_width dest_height interp_type' + checkUnexpectedReturnNULL "gdk_pixbuf_scale_simple" result result' <- (wrapObject Pixbuf) result touchManagedPtr _obj return result' @@ -1587,6 +1611,7 @@ let copy_pixels' = (fromIntegral . fromEnum) copy_pixels onException (do result <- propagateGError $ gdk_pixbuf_from_pixdata pixdata' copy_pixels' + checkUnexpectedReturnNULL "gdk_pixbuf_from_pixdata" result result' <- (wrapObject Pixbuf) result touchManagedPtr pixdata return result' @@ -1619,6 +1644,7 @@ width <- allocMem :: IO (Ptr Int32) height <- allocMem :: IO (Ptr Int32) result <- gdk_pixbuf_get_file_info filename' width height + checkUnexpectedReturnNULL "gdk_pixbuf_get_file_info" result result' <- (newBoxed PixbufFormat) result width' <- peek width height' <- peek height @@ -1657,7 +1683,7 @@ Just jCancellable -> do let jCancellable' = unsafeManagedPtrCastPtr jCancellable return jCancellable' - ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC) + ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC)) maybeCallback <- case callback of Nothing -> return (castPtrToFunPtr nullPtr) Just jCallback -> do @@ -1697,6 +1723,7 @@ height <- allocMem :: IO (Ptr Int32) onException (do result <- propagateGError $ gdk_pixbuf_get_file_info_finish async_result' width height + checkUnexpectedReturnNULL "gdk_pixbuf_get_file_info_finish" result result' <- (newBoxed PixbufFormat) result width' <- peek width height' <- peek height @@ -1727,6 +1754,7 @@ m [PixbufFormat] pixbufGetFormats = liftIO $ do result <- gdk_pixbuf_get_formats + checkUnexpectedReturnNULL "gdk_pixbuf_get_formats" result result' <- unpackGSList result result'' <- mapM (newBoxed PixbufFormat) result' g_slist_free result @@ -1762,7 +1790,7 @@ Just jCancellable -> do let jCancellable' = unsafeManagedPtrCastPtr jCancellable return jCancellable' - ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC) + ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC)) maybeCallback <- case callback of Nothing -> return (castPtrToFunPtr nullPtr) Just jCallback -> do @@ -1812,7 +1840,7 @@ Just jCancellable -> do let jCancellable' = unsafeManagedPtrCastPtr jCancellable return jCancellable' - ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC) + ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC)) maybeCallback <- case callback of Nothing -> return (castPtrToFunPtr nullPtr) Just jCallback -> do @@ -1921,6 +1949,7 @@ filename' <- textToCString filename onException (do result <- propagateGError $ gdk_pixbuf_animation_new_from_file filename' + checkUnexpectedReturnNULL "gdk_pixbuf_animation_new_from_file" result result' <- (wrapObject PixbufAnimation) result freeMem filename' return result' @@ -1951,6 +1980,7 @@ resource_path' <- textToCString resource_path onException (do result <- propagateGError $ gdk_pixbuf_animation_new_from_resource resource_path' + checkUnexpectedReturnNULL "gdk_pixbuf_animation_new_from_resource" result result' <- (wrapObject PixbufAnimation) result freeMem resource_path' return result' @@ -1988,6 +2018,7 @@ return jCancellable' onException (do result <- propagateGError $ gdk_pixbuf_animation_new_from_stream stream' maybeCancellable + checkUnexpectedReturnNULL "gdk_pixbuf_animation_new_from_stream" result result' <- (wrapObject PixbufAnimation) result touchManagedPtr stream whenJust cancellable touchManagedPtr @@ -2019,6 +2050,7 @@ let async_result' = unsafeManagedPtrCastPtr async_result onException (do result <- propagateGError $ gdk_pixbuf_animation_new_from_stream_finish async_result' + checkUnexpectedReturnNULL "gdk_pixbuf_animation_new_from_stream_finish" result result' <- (wrapObject PixbufAnimation) result touchManagedPtr async_result return result' @@ -2078,6 +2110,7 @@ let jStart_time' = unsafeManagedPtrGetPtr jStart_time return jStart_time' result <- gdk_pixbuf_animation_get_iter _obj' maybeStart_time + checkUnexpectedReturnNULL "gdk_pixbuf_animation_get_iter" result result' <- (wrapObject PixbufAnimationIter) result touchManagedPtr _obj whenJust start_time touchManagedPtr @@ -2104,6 +2137,7 @@ pixbufAnimationGetStaticImage _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_animation_get_static_image _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_animation_get_static_image" result result' <- (newObject Pixbuf) result touchManagedPtr _obj return result' @@ -2187,7 +2221,7 @@ Just jCancellable -> do let jCancellable' = unsafeManagedPtrCastPtr jCancellable return jCancellable' - ptrcallback <- callocBytes $ sizeOf (undefined :: FunPtr Gio.AsyncReadyCallbackC) + ptrcallback <- callocMem :: IO (Ptr (FunPtr Gio.AsyncReadyCallbackC)) maybeCallback <- case callback of Nothing -> return (castPtrToFunPtr nullPtr) Just jCallback -> do @@ -2299,6 +2333,7 @@ pixbufAnimationIterGetPixbuf _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_animation_iter_get_pixbuf _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_animation_iter_get_pixbuf" result result' <- (newObject Pixbuf) result touchManagedPtr _obj return result' @@ -2440,6 +2475,7 @@ pixbufFormatCopy _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_copy _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_copy" result result' <- (wrapBoxed PixbufFormat) result touchManagedPtr _obj return result' @@ -2489,6 +2525,7 @@ pixbufFormatGetDescription _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_get_description _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_get_description" result result' <- cstringToText result freeMem result touchManagedPtr _obj @@ -2515,6 +2552,7 @@ pixbufFormatGetExtensions _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_get_extensions _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_get_extensions" result result' <- unpackZeroTerminatedUTF8CArray result mapZeroTerminatedCArray freeMem result freeMem result @@ -2542,6 +2580,7 @@ pixbufFormatGetLicense _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_get_license _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_get_license" result result' <- cstringToText result freeMem result touchManagedPtr _obj @@ -2568,6 +2607,7 @@ pixbufFormatGetMimeTypes _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_get_mime_types _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_get_mime_types" result result' <- unpackZeroTerminatedUTF8CArray result mapZeroTerminatedCArray freeMem result freeMem result @@ -2595,6 +2635,7 @@ pixbufFormatGetName _obj = liftIO $ do let _obj' = unsafeManagedPtrGetPtr _obj result <- gdk_pixbuf_format_get_name _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_format_get_name" result result' <- cstringToText result freeMem result touchManagedPtr _obj @@ -2741,6 +2782,7 @@ m PixbufLoader pixbufLoaderNew = liftIO $ do result <- gdk_pixbuf_loader_new + checkUnexpectedReturnNULL "gdk_pixbuf_loader_new" result result' <- (wrapObject PixbufLoader) result return result' @@ -2767,6 +2809,7 @@ mime_type' <- textToCString mime_type onException (do result <- propagateGError $ gdk_pixbuf_loader_new_with_mime_type mime_type' + checkUnexpectedReturnNULL "gdk_pixbuf_loader_new_with_mime_type" result result' <- (wrapObject PixbufLoader) result freeMem mime_type' return result' @@ -2797,6 +2840,7 @@ image_type' <- textToCString image_type onException (do result <- propagateGError $ gdk_pixbuf_loader_new_with_type image_type' + checkUnexpectedReturnNULL "gdk_pixbuf_loader_new_with_type" result result' <- (wrapObject PixbufLoader) result freeMem image_type' return result' @@ -2854,6 +2898,7 @@ pixbufLoaderGetAnimation _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_loader_get_animation _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_loader_get_animation" result result' <- (newObject PixbufAnimation) result touchManagedPtr _obj return result' @@ -2879,6 +2924,7 @@ pixbufLoaderGetFormat _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_loader_get_format _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_loader_get_format" result result' <- (newBoxed PixbufFormat) result touchManagedPtr _obj return result' @@ -2904,6 +2950,7 @@ pixbufLoaderGetPixbuf _obj = liftIO $ do let _obj' = unsafeManagedPtrCastPtr _obj result <- gdk_pixbuf_loader_get_pixbuf _obj' + checkUnexpectedReturnNULL "gdk_pixbuf_loader_get_pixbuf" result result' <- (newObject Pixbuf) result touchManagedPtr _obj return result' @@ -3288,6 +3335,7 @@ pixbufSimpleAnimNew width height rate = liftIO $ do let rate' = realToFrac rate result <- gdk_pixbuf_simple_anim_new width height rate' + checkUnexpectedReturnNULL "gdk_pixbuf_simple_anim_new" result result' <- (wrapObject PixbufSimpleAnim) result return result' @@ -3491,6 +3539,7 @@ stream_length_p <- allocMem :: IO (Ptr Word32) result <- gdk_pixdata_serialize _obj' stream_length_p stream_length_p' <- peek stream_length_p + checkUnexpectedReturnNULL "gdk_pixdata_serialize" result result' <- (unpackByteStringWithLength stream_length_p') result freeMem result touchManagedPtr _obj @@ -3524,6 +3573,7 @@ name' <- textToCString name let dump_type' = gflagsToWord dump_type result <- gdk_pixdata_to_csource _obj' name' dump_type' + checkUnexpectedReturnNULL "gdk_pixdata_to_csource" result result' <- (wrapBoxed GLib.String) result touchManagedPtr _obj freeMem name' diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -454,49 +454,3 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/gi-gdkpixbuf.cabal b/gi-gdkpixbuf.cabal --- a/gi-gdkpixbuf.cabal +++ b/gi-gdkpixbuf.cabal @@ -1,6 +1,6 @@ -- Autogenerated, do not edit. name: gi-gdkpixbuf -version: 0.2.31.9 +version: 0.2.31.10 synopsis: GdkPixbuf bindings description: Bindings for GdkPixbuf, autogenerated by haskell-gi. homepage: https://github.com/haskell-gi/haskell-gi @@ -17,10 +17,10 @@ exposed-modules: GI.GdkPixbuf, GI.GdkPixbufAttributes, GI.GdkPixbufSignals pkgconfig-depends: gdk-pixbuf-2.0 >= 2.31 build-depends: base >= 4.7 && <5, - haskell-gi-base >= 0.9 && < 1, - gi-glib >= 0.2.44.9 && < 0.3, - gi-gobject >= 0.2.44.9 && < 0.3, - gi-gio >= 0.2.44.9 && < 0.3, + haskell-gi-base >= 0.10 && < 1, + gi-glib >= 0.2.44.10 && < 0.3, + gi-gobject >= 0.2.44.10 && < 0.3, + gi-gio >= 0.2.44.10 && < 0.3, bytestring >= 0.10, containers >= 0.5, text >= 1.0,