groupdocs_conversion_cloud 23.2 → 23.4

data/lib/groupdocs_conversion_cloud/models/jpeg_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, quality].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, quality].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/jpf_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, quality].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, quality].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/jpg_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, quality].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, quality].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/jpm_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, quality].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, quality].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/jpx_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -106,6 +106,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -113,7 +114,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -128,6 +128,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -135,7 +136,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -166,6 +166,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -194,10 +198,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -327,6 +327,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -334,7 +335,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -351,7 +351,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode, quality].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, quality].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/odg_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired image width after conversion
     attr_accessor :width
 
@@ -61,9 +64,6 @@ module GroupDocsConversionCloud
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Adjust image brightness
     attr_accessor :brightness
 
@@ -103,6 +103,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'horizontal_resolution' => :'HorizontalResolution',
@@ -110,7 +111,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'Grayscale',
         :'rotate_angle' => :'RotateAngle',
         :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Brightness',
         :'contrast' => :'Contrast',
         :'gamma' => :'Gamma',
@@ -124,6 +124,7 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'horizontal_resolution' => :'Integer',
@@ -131,7 +132,6 @@ module GroupDocsConversionCloud
         :'grayscale' => :'BOOLEAN',
         :'rotate_angle' => :'Integer',
         :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions',
         :'brightness' => :'Integer',
         :'contrast' => :'Integer',
         :'gamma' => :'Float',
@@ -161,6 +161,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -189,10 +193,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'Brightness')
         self.brightness = attributes[:'Brightness']
       end
@@ -313,6 +313,7 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           horizontal_resolution == other.horizontal_resolution &&
@@ -320,7 +321,6 @@ module GroupDocsConversionCloud
           grayscale == other.grayscale &&
           rotate_angle == other.rotate_angle &&
           use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options &&
           brightness == other.brightness &&
           contrast == other.contrast &&
           gamma == other.gamma &&
@@ -336,7 +336,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, watermark_options, brightness, contrast, gamma, flip_mode].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/odp_convert_options.rb

@@ -40,24 +40,24 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Set this property if you want to protect the converted document with a password
     attr_accessor :password
 
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Powerpoint 2010. Starting from Microsoft Powerpoint 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'Password',
-        :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions'
+        :'zoom' => :'Zoom'
       }
     end
 
@@ -67,9 +67,9 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'String',
-        :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions'
+        :'zoom' => :'Integer'
       }
     end
 
@@ -95,6 +95,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Password')
         self.password = attributes[:'Password']
       end
@@ -103,10 +107,6 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -145,9 +145,9 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           password == other.password &&
-          zoom == other.zoom &&
-          watermark_options == other.watermark_options
+          zoom == other.zoom
     end
 
     # @see the `==` method
@@ -159,7 +159,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, password, zoom, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, password, zoom].hash
     end
 
     # Downcases first letter.