groupdocs_conversion_cloud 23.2 → 23.6

data/lib/groupdocs_conversion_cloud/models/tif_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
@@ -338,6 +338,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 &&
@@ -345,7 +346,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 &&
@@ -362,7 +362,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, compression].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, compression].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/tiff_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
@@ -338,6 +338,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 &&
@@ -345,7 +346,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 &&
@@ -362,7 +362,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, compression].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, compression].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/tsv_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
+
     # Set this property if you want to protect the converted document with a password
     attr_accessor :password
 
@@ -49,19 +52,16 @@ 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
-
     # 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',
-        :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'UsePdf'
       }
     end
 
@@ -71,10 +71,10 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions'
+        :'use_pdf' => :'BOOLEAN'
       }
     end
 
@@ -100,6 +100,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Password')
         self.password = attributes[:'Password']
       end
@@ -112,10 +116,6 @@ module GroupDocsConversionCloud
         self.use_pdf = attributes[:'UsePdf']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -159,10 +159,10 @@ 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 &&
-          use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options
+          use_pdf == other.use_pdf
     end
 
     # @see the `==` method
@@ -174,7 +174,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, password, zoom, use_pdf, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, password, zoom, use_pdf].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/txt_convert_options.rb

@@ -40,12 +40,16 @@ 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
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
-        :'pages' => :'Pages'
+        :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions'
       }
     end
 
@@ -54,7 +58,8 @@ module GroupDocsConversionCloud
       {
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
-        :'pages' => :'Array<Integer>'
+        :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions'
       }
     end
 
@@ -80,6 +85,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -112,7 +121,8 @@ module GroupDocsConversionCloud
       self.class == other.class &&
           from_page == other.from_page &&
           pages_count == other.pages_count &&
-          pages == other.pages
+          pages == other.pages &&
+          watermark_options == other.watermark_options
     end
 
     # @see the `==` method
@@ -124,7 +134,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages].hash
+      [from_page, pages_count, pages, watermark_options].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/{html_convert_options.rb → web_convert_options.rb}

@@ -1,6 +1,6 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose Pty Ltd" file="html_convert_options.rb">
+ # <copyright company="Aspose Pty Ltd" file="web_convert_options.rb">
  #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
@@ -29,7 +29,7 @@ require 'date'
 
 module GroupDocsConversionCloud
   # Options for to Html conversion
-  class HtmlConvertOptions
+  class WebConvertOptions
 
     # Start conversion from FromPage page
     attr_accessor :from_page
@@ -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
+
     # If true, the input firstly is converted to PDF and after that to desired format
     attr_accessor :use_pdf
 
@@ -52,20 +55,17 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100.
     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',
         :'use_pdf' => :'UsePdf',
         :'fixed_layout' => :'FixedLayout',
         :'fixed_layout_show_borders' => :'FixedLayoutShowBorders',
-        :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions'
+        :'zoom' => :'Zoom'
       }
     end
 
@@ -75,11 +75,11 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'use_pdf' => :'BOOLEAN',
         :'fixed_layout' => :'BOOLEAN',
         :'fixed_layout_show_borders' => :'BOOLEAN',
-        :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions'
+        :'zoom' => :'Integer'
       }
     end
 
@@ -105,6 +105,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'UsePdf')
         self.use_pdf = attributes[:'UsePdf']
       end
@@ -121,10 +125,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?
@@ -178,11 +178,11 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           use_pdf == other.use_pdf &&
           fixed_layout == other.fixed_layout &&
           fixed_layout_show_borders == other.fixed_layout_show_borders &&
-          zoom == other.zoom &&
-          watermark_options == other.watermark_options
+          zoom == other.zoom
     end
 
     # @see the `==` method
@@ -194,7 +194,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, use_pdf, fixed_layout, fixed_layout_show_borders, zoom, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, use_pdf, fixed_layout, fixed_layout_show_borders, zoom].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/{html_load_options.rb → web_load_options.rb}

@@ -1,6 +1,6 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose Pty Ltd" file="html_load_options.rb">
+ # <copyright company="Aspose Pty Ltd" file="web_load_options.rb">
  #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
@@ -29,7 +29,7 @@ require 'date'
 
 module GroupDocsConversionCloud
   # Html document load options
-  class HtmlLoadOptions
+  class WebLoadOptions
 
     # The format of input file, (\"docx\", for example). This field must be filled with correct input file format when using ConvertDirect method, which accept input file as binary stream, and, because of that, API can correctly handle LoadOptions. In regular conversion, the input file format taken from the input file name and this field ignored.
     attr_accessor :format

data/lib/groupdocs_conversion_cloud/models/webp_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, lossless].hash
+      [from_page, pages_count, pages, watermark_options, width, height, horizontal_resolution, vertical_resolution, grayscale, rotate_angle, use_pdf, brightness, contrast, gamma, flip_mode, lossless].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/wmf_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.