Fix PixbufFormat, regen Pixbuf #57

EPashkin · 2017-12-17T18:07:06Z

Closes #55
Closes #56
Closes #23

Build will fails until gtk-rs/glib#278

cc @GuillaumeGomez, @sdroege

EPashkin · 2017-12-17T18:25:45Z

Ok, PR is finished,
Not all async functions generated by unknown reason, but we can finish it later.

GuillaumeGomez · 2017-12-17T18:34:32Z

I agree. Once CI is good, it's good for me as well.

EPashkin · 2017-12-17T19:14:15Z

Forgot to check async function, at minimum new_from_stream_async need be manual.

sdroege · 2017-12-17T19:22:43Z

Generally looks good, good work :) will check later in detail, not ideal from the phone

EPashkin · 2017-12-17T19:54:29Z

Updated.

EPashkin · 2017-12-28T19:35:47Z

@sdroege Please, look at this if you have time.

sdroege · 2017-12-28T20:38:22Z

I will tomorrow, thanks for the reminder. I missed that something is left to be done here

sdroege · 2017-12-29T11:31:06Z

Also feel free to remind me sooner than ~2 weeks later for such things in the future :)

sdroege · 2017-12-29T11:38:32Z

src/auto/pixbuf.rs

+
+    fn composite_color_simple(&self, dest_width: i32, dest_height: i32, interp_type: InterpType, overall_alpha: i32, check_size: i32, color1: u32, color2: u32) -> Option<Pixbuf>;
+
+    fn copy(&self) -> Option<Pixbuf>;


Can this really fail? And the others returning an Option

Bad, but yes: https://developer.gnome.org/gdk-pixbuf/stable/gdk-pixbuf-Image-Data-in-Memory.html#gdk-pixbuf-copy

I will check all others later.

Interesting

sdroege · 2017-12-29T11:39:54Z

src/auto/pixbuf.rs


    //#[cfg(any(feature = "v2_36", feature = "dox"))]
-    //fn save_to_streamv_async<'a, P: IsA</*Ignored*/gio::OutputStream>, Q: Into<Option<&'a gio::Cancellable>>, R: /*Ignored*/gio::AsyncReadyCallback>(&self, stream: &P, type_: &str, option_keys: &[&str], option_values: &[&str], cancellable: Q, callback: R);
+    //fn save_to_streamv_async<'a, P: IsA<gio::OutputStream>, Q: Into<Option<&'a gio::Cancellable>>, R: /*Unimplemented*/gio::AsyncReadyCallback>(&self, stream: &P, type_: &str, option_keys: &[&str], option_values: &[&str], cancellable: Q, callback: R);

    fn savev(&self, filename: &str, type_: &str, option_keys: &[&str], option_values: &[&str]) -> Result<(), Error>;


This was already weird before, but it seems like this should be taking a options: &[(&str, &str)] instead? It's probably unsafe now if the arrays are different length?

You right. Maybe even options: &[(AsRef<str>, AsRef<str>)]

sdroege · 2017-12-29T11:41:03Z

src/pixbuf.rs

@@ -178,10 +163,44 @@ impl Pixbuf {
        }
    }

-    pub fn copy(&self) -> Pixbuf {


Here it also was not returning an Option.

Maybe take a diff of the API changes here to make sure the API is not regressing without noticing.

sdroege · 2017-12-29T11:41:23Z

src/pixbuf.rs

@@ -178,10 +163,44 @@ impl Pixbuf {
        }
    }

-    pub fn copy(&self) -> Pixbuf {
+    pub fn get_file_info(filename: &str) -> Option<(PixbufFormat, i32, i32)> {


This should probably be a &Path?

Yes, I change it to AsRef<Path>

EPashkin · 2017-12-30T05:42:08Z

@sdroege Updated with AsRef<Path> for file names and &[(&str, &str)] for save options.
Tried &[(AsRef<str>, AsRef<str>)], but it make problem with saving without options.
About return Option<Pixbuf>: seems Pixbuf even don't follow glib rules that object constructors can't return null, so all function returning Pixbuf need be optional.
I stuck with rust-lang/rust#47048 and can't build gir, so I can't change this now and propose postpone this change.

sdroege · 2017-12-30T08:07:13Z

👍

GuillaumeGomez · 2017-12-30T09:36:49Z

Thanks!

EPashkin added 4 commits December 17, 2017 21:22

Update gir submodule

6c49a7f

Remove manual functions for Pixbuf

96b96b0

Fix PixbufFormat muttable self for getters and checkers

59e6cd8

Generate Pixbuf steam functions

f7bb0e1

EPashkin force-pushed the fix_PixbufFormat_regen_Pixbuf branch from d97b088 to 62d23bf Compare December 17, 2017 18:23

EPashkin changed the title ~~WIP: Fix PixbufFormat, regen Pixbuf~~ Fix PixbufFormat, regen Pixbuf Dec 17, 2017

EPashkin added 2 commits December 17, 2017 22:53

Fix async functions

a962e78

Regen

bad7e46

EPashkin force-pushed the fix_PixbufFormat_regen_Pixbuf branch from 62d23bf to bad7e46 Compare December 17, 2017 19:54

sdroege reviewed Dec 29, 2017

View reviewed changes

EPashkin added 2 commits December 30, 2017 06:46

Use AsRef<Path> for filenames

6198488

Implement safer version save*

4b8383d

GuillaumeGomez merged commit 1e9ce85 into gtk-rs:master Dec 30, 2017

EPashkin deleted the fix_PixbufFormat_regen_Pixbuf branch December 30, 2017 09:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix PixbufFormat, regen Pixbuf #57

Fix PixbufFormat, regen Pixbuf #57

EPashkin commented Dec 17, 2017

EPashkin commented Dec 17, 2017

GuillaumeGomez commented Dec 17, 2017

EPashkin commented Dec 17, 2017

sdroege commented Dec 17, 2017

EPashkin commented Dec 17, 2017

EPashkin commented Dec 28, 2017

sdroege commented Dec 28, 2017

sdroege commented Dec 29, 2017

sdroege Dec 29, 2017

EPashkin Dec 29, 2017

EPashkin Dec 29, 2017

sdroege Dec 29, 2017

sdroege Dec 29, 2017

EPashkin Dec 29, 2017

sdroege Dec 29, 2017

sdroege Dec 29, 2017

EPashkin Dec 29, 2017

EPashkin commented Dec 30, 2017

sdroege commented Dec 30, 2017

GuillaumeGomez commented Dec 30, 2017


		fn composite_color_simple(&self, dest_width: i32, dest_height: i32, interp_type: InterpType, overall_alpha: i32, check_size: i32, color1: u32, color2: u32) -> Option<Pixbuf>;

		fn copy(&self) -> Option<Pixbuf>;

Fix PixbufFormat, regen Pixbuf #57

Fix PixbufFormat, regen Pixbuf #57

Conversation

EPashkin commented Dec 17, 2017

EPashkin commented Dec 17, 2017

GuillaumeGomez commented Dec 17, 2017

EPashkin commented Dec 17, 2017

sdroege commented Dec 17, 2017

EPashkin commented Dec 17, 2017

EPashkin commented Dec 28, 2017

sdroege commented Dec 28, 2017

sdroege commented Dec 29, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EPashkin commented Dec 30, 2017

sdroege commented Dec 30, 2017

GuillaumeGomez commented Dec 30, 2017