diff --git a/adcom1/audio_placement.go b/adcom1/audio_placement.go index 1eeb604..a8b6d77 100644 --- a/adcom1/audio_placement.go +++ b/adcom1/audio_placement.go @@ -134,7 +134,7 @@ type AudioPlacement struct { // integer // Definition: // Minimum bit rate of the creative in Kbps. - MinBitR uint64 `json:"minbitr,omitempty"` + MinBitR int `json:"minbitr,omitempty"` // Attribute: // maxbitr @@ -142,7 +142,7 @@ type AudioPlacement struct { // integer // Definition: // Maximum bit rate of the creative in Kbps. - MaxBitR uint64 `json:"maxbitr,omitempty"` + MaxBitR int `json:"maxbitr,omitempty"` // Attribute: // delivery diff --git a/adcom1/device.go b/adcom1/device.go index 69c42c0..99eb4ca 100644 --- a/adcom1/device.go +++ b/adcom1/device.go @@ -95,7 +95,7 @@ type Device struct { // integer // Definition: // Physical height of the screen in pixels. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // w @@ -103,7 +103,7 @@ type Device struct { // integer // Definition: // Physical width of the screen in pixels. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // ppi diff --git a/adcom1/display.go b/adcom1/display.go index 638781b..93d4dd3 100644 --- a/adcom1/display.go +++ b/adcom1/display.go @@ -40,7 +40,7 @@ type Display struct { // Definition: // Absolute width of the creative in device independent pixels (DIPS), typically for non-native ads. // Note that mixing absolute and relative sizes is not recommended. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -49,7 +49,7 @@ type Display struct { // Definition: // Absolute height of the creative in device independent pixels (DIPS), typically for non-native ads. // Note that mixing absolute and relative sizes is not recommended. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // wratio diff --git a/adcom1/display_format.go b/adcom1/display_format.go index 1180445..2e42fc9 100644 --- a/adcom1/display_format.go +++ b/adcom1/display_format.go @@ -11,7 +11,7 @@ type DisplayFormat struct { // Definition: // Absolute width of the creative in units specified by DisplayPlacement.unit. // Note that mixing absolute and relative sizes is not recommended. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -20,7 +20,7 @@ type DisplayFormat struct { // Definition: // Absolute height of the creative in units specified by DisplayPlacement.unit. // Note that mixing absolute and relative sizes is not recommended. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // wratio diff --git a/adcom1/display_placement.go b/adcom1/display_placement.go index f0064c3..01a7fca 100644 --- a/adcom1/display_placement.go +++ b/adcom1/display_placement.go @@ -110,7 +110,7 @@ type DisplayPlacement struct { // Definition: // Width of the placement in units specified by unit. // Note that this size applies to the placement itself; permitted creative sizes are specified elsewhere (e.g., DisplayFormat, ImageAssetFormat, etc.). - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -119,7 +119,7 @@ type DisplayPlacement struct { // Definition: // Width of the placement in units specified by unit. // Note that this size applies to the placement itself; permitted creative sizes are specified elsewhere (e.g., DisplayFormat, ImageAssetFormat, etc.). - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // unit diff --git a/adcom1/image_asset.go b/adcom1/image_asset.go index 0b686b4..f6f5cd9 100644 --- a/adcom1/image_asset.go +++ b/adcom1/image_asset.go @@ -19,7 +19,7 @@ type ImageAsset struct { // integer; recommended // Definition: // Width of the image asset in device independent pixels (DIPS). - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -27,7 +27,7 @@ type ImageAsset struct { // integer; recommended // Definition: // Height of the image asset in device independent pixels (DIPS). - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // type diff --git a/adcom1/image_asset_format.go b/adcom1/image_asset_format.go index 4682ab0..d9eeae5 100644 --- a/adcom1/image_asset_format.go +++ b/adcom1/image_asset_format.go @@ -30,7 +30,7 @@ type ImageAssetFormat struct { // Definition: // Absolute width of the image asset in device independent pixels (DIPS). // Note that mixing absolute and relative sizes is not recommended. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -39,7 +39,7 @@ type ImageAssetFormat struct { // Definition: // Absolute height of the image asset in device independent pixels (DIPS). // Note that mixing absolute and relative sizes is not recommended. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // wmin @@ -48,7 +48,7 @@ type ImageAssetFormat struct { // Definition: // The minimum requested absolute width of the image in device independent pixels (DIPS). // This option should be used for any scaling of images by the client. - WMin uint64 `json:"wmin,omitempty"` + WMin int `json:"wmin,omitempty"` // Attribute: // hmin @@ -57,7 +57,7 @@ type ImageAssetFormat struct { // Definition: // The minimum requested absolute height of the image in device independent pixels (DIPS). // This option should be used for any scaling of images by the client. - HMin uint64 `json:"hmin,omitempty"` + HMin int `json:"hmin,omitempty"` // Attribute: // wratio diff --git a/adcom1/video_placement.go b/adcom1/video_placement.go index 726febb..8469064 100644 --- a/adcom1/video_placement.go +++ b/adcom1/video_placement.go @@ -116,7 +116,7 @@ type VideoPlacement struct { // integer // Definition: // Width of the placement in units specified by unit. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -124,7 +124,7 @@ type VideoPlacement struct { // integer // Definition: // Height of the placement in units specified by unit. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // unit @@ -168,7 +168,7 @@ type VideoPlacement struct { // integer // Definition: // Minimum bit rate of the creative in Kbps. - MinBitR uint64 `json:"minbitr,omitempty"` + MinBitR int `json:"minbitr,omitempty"` // Attribute: // maxbitr @@ -176,7 +176,7 @@ type VideoPlacement struct { // integer // Definition: // Maximum bit rate of the creative in Kbps. - MaxBitR uint64 `json:"maxbitr,omitempty"` + MaxBitR int `json:"maxbitr,omitempty"` // Attribute: // delivery diff --git a/native1/request/image.go b/native1/request/image.go index d7d7830..dc0e8dd 100644 --- a/native1/request/image.go +++ b/native1/request/image.go @@ -32,7 +32,7 @@ type Image struct { // integer // Description: // Width of the image in pixels. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Field: // wmin @@ -45,7 +45,7 @@ type Image struct { // This option should be used for any rescaling of images by the client. // Either w or wmin should be transmitted. // If only w is included, it should be considered an exact requirement. - WMin uint64 `json:"wmin,omitempty"` + WMin int `json:"wmin,omitempty"` // Field: // h @@ -55,7 +55,7 @@ type Image struct { // integer // Description: // Height of the image in pixels. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Field: // hmin @@ -68,7 +68,7 @@ type Image struct { // This option should be used for any rescaling of images by the client. // Either h or hmin should be transmitted. // If only h is included, it should be considered an exact requirement. - HMin uint64 `json:"hmin,omitempty"` + HMin int `json:"hmin,omitempty"` // Field: // mimes diff --git a/native1/response/image.go b/native1/response/image.go index 0ae83c4..a5007a2 100644 --- a/native1/response/image.go +++ b/native1/response/image.go @@ -44,7 +44,7 @@ type Image struct { // Width of the image in pixels. // Recommended for embedded asset responses. // Required for assetsurl/dcourlresponses if multiple assets of same type submitted. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Field: // h @@ -56,7 +56,7 @@ type Image struct { // Height of the image in pixels. // Recommended for embedded asset responses. // Required for assetsurl/dcourl responses if multiple assets of same type submitted. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Field: // ext diff --git a/openrtb2/audio.go b/openrtb2/audio.go index 9eec597..31fc957 100644 --- a/openrtb2/audio.go +++ b/openrtb2/audio.go @@ -63,7 +63,7 @@ type Audio struct { // If multiple ad impressions are offered in the same bid request, // the sequence number will allow for the coordinated delivery // of multiple creatives. - Sequence uint64 `json:"sequence,omitempty"` + Sequence int `json:"sequence,omitempty"` // Attribute: // battr @@ -91,7 +91,7 @@ type Audio struct { // integer // Description: // Minimum bit rate in Kbps. - MinBitrate uint64 `json:"minbitrate,omitempty"` + MinBitrate int `json:"minbitrate,omitempty"` // Attribute: // maxbitrate @@ -99,7 +99,7 @@ type Audio struct { // integer // Description: // Maximum bit rate in Kbps. - MaxBitrate uint64 `json:"maxbitrate,omitempty"` + MaxBitrate int `json:"maxbitrate,omitempty"` // Attribute: // delivery @@ -147,7 +147,7 @@ type Audio struct { // The maximum number of ads that can be played in an ad pod. // OpenRTB API Specification Version 2.5 IAB Technology Lab // www.iab.com/openrtb Page 18 - MaxSeq uint64 `json:"maxseq,omitempty"` + MaxSeq int `json:"maxseq,omitempty"` // Attribute: // feed diff --git a/openrtb2/banner.go b/openrtb2/banner.go index 2005be7..dbb1281 100644 --- a/openrtb2/banner.go +++ b/openrtb2/banner.go @@ -30,7 +30,7 @@ type Banner struct { // Description: // Exact width in device independent pixels (DIPS); // recommended if no format objects are specified. - W *uint64 `json:"w,omitempty"` + W *int `json:"w,omitempty"` // Attribute: // h @@ -39,7 +39,7 @@ type Banner struct { // Description: // Exact height in device independent pixels (DIPS); // recommended if no format objects are specified. - H *uint64 `json:"h,omitempty"` + H *int `json:"h,omitempty"` // Attribute: // wmax @@ -48,7 +48,7 @@ type Banner struct { // Description: // NOTE: Deprecated in favor of the format array. // Maximum width in device independent pixels (DIPS). - WMax uint64 `json:"wmax,omitempty"` + WMax int `json:"wmax,omitempty"` // Attribute: // hmax @@ -57,7 +57,7 @@ type Banner struct { // Description: // NOTE: Deprecated in favor of the format array. // Maximum height in device independent pixels (DIPS). - HMax uint64 `json:"hmax,omitempty"` + HMax int `json:"hmax,omitempty"` // Attribute: // wmin @@ -66,7 +66,7 @@ type Banner struct { // Description: // NOTE: Deprecated in favor of the format array. // Minimum width in device independent pixels (DIPS). - WMin uint64 `json:"wmin,omitempty"` + WMin int `json:"wmin,omitempty"` // Attribute: // hmin @@ -75,7 +75,7 @@ type Banner struct { // Description: // NOTE: Deprecated in favor of the format array. // Minimum height in device independent pixels (DIPS). - HMin uint64 `json:"hmin,omitempty"` + HMin int `json:"hmin,omitempty"` // Attribute: // btype diff --git a/openrtb2/bid.go b/openrtb2/bid.go index 47c47a9..3a067d9 100644 --- a/openrtb2/bid.go +++ b/openrtb2/bid.go @@ -232,7 +232,7 @@ type Bid struct { // integer // Description: // Width of the creative in device independent pixels (DIPS). - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -240,7 +240,7 @@ type Bid struct { // integer // Description: // Height of the creative in device independent pixels (DIPS). - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // wratio @@ -249,7 +249,7 @@ type Bid struct { // Description: // Relative width of the creative when expressing size as a ratio. // Required for Flex Ads. - WRatio uint64 `json:"wratio,omitempty"` + WRatio int `json:"wratio,omitempty"` // Attribute: // hratio @@ -258,7 +258,7 @@ type Bid struct { // Description: // Relative height of the creative when expressing size as a ratio. // Required for Flex Ads. - HRatio uint64 `json:"hratio,omitempty"` + HRatio int `json:"hratio,omitempty"` // Attribute: // exp diff --git a/openrtb2/content.go b/openrtb2/content.go index 8790e73..b936be1 100644 --- a/openrtb2/content.go +++ b/openrtb2/content.go @@ -24,7 +24,7 @@ type Content struct { // integer // Description: // Episode number. - Episode uint64 `json:"episode,omitempty"` + Episode int `json:"episode,omitempty"` // Attribute: // title diff --git a/openrtb2/device.go b/openrtb2/device.go index 5128f26..a8a6c7b 100644 --- a/openrtb2/device.go +++ b/openrtb2/device.go @@ -123,7 +123,7 @@ type Device struct { // integer // Description: // Physical height of the screen in pixels. - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // w @@ -131,7 +131,7 @@ type Device struct { // integer // Description: // Physical width of the screen in pixels. - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // ppi @@ -139,7 +139,7 @@ type Device struct { // integer // Description: // Screen size as pixels per linear inch. - PPI uint64 `json:"ppi,omitempty"` + PPI int `json:"ppi,omitempty"` // Attribute: // pxratio diff --git a/openrtb2/format.go b/openrtb2/format.go index 6628348..ab0acbf 100644 --- a/openrtb2/format.go +++ b/openrtb2/format.go @@ -15,7 +15,7 @@ type Format struct { // integer // Description: // Width in device independent pixels (DIPS). - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -23,7 +23,7 @@ type Format struct { // integer // Description: // Height in device independent pixels (DIPS). - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // wratio @@ -31,7 +31,7 @@ type Format struct { // integer // Description: // Relative width when expressing size as a ratio - WRatio uint64 `json:"wratio,omitempty"` + WRatio int `json:"wratio,omitempty"` // Attribute: // hratio @@ -39,7 +39,7 @@ type Format struct { // Integer // Description: // Relative height when expressing size as a ratio. - HRatio uint64 `json:"hratio,omitempty"` + HRatio int `json:"hratio,omitempty"` // Attribute: // wmin @@ -48,7 +48,7 @@ type Format struct { // Description: // The minimum width in device independent pixels (DIPS) at // which the ad will be displayed the size is expressed as a ratio. - WMin uint64 `json:"wmin,omitempty"` + WMin int `json:"wmin,omitempty"` // Attribute: // ext diff --git a/openrtb2/geo.go b/openrtb2/geo.go index cad1ee3..ed3cc37 100644 --- a/openrtb2/geo.go +++ b/openrtb2/geo.go @@ -48,7 +48,7 @@ type Geo struct { // services (i.e., type = 1). Note that this is the accuracy as // reported from the device. Consult OS specific documentation // (e.g., Android, iOS) for exact interpretation. - Accuracy uint64 `json:"accuracy,omitempty"` + Accuracy int `json:"accuracy,omitempty"` // Attribute: // lastfix diff --git a/openrtb2/ptr.go b/openrtb2/ptr.go index 4b6d364..738d538 100644 --- a/openrtb2/ptr.go +++ b/openrtb2/ptr.go @@ -6,6 +6,6 @@ func Int8Ptr(n int8) *int8 { } // Uint64Ptr returns pointer to passed argument. -func Uint64Ptr(n uint64) *uint64 { +func Uint64Ptr(n int) *int { return &n } diff --git a/openrtb2/video.go b/openrtb2/video.go index 488411e..b90c058 100644 --- a/openrtb2/video.go +++ b/openrtb2/video.go @@ -66,7 +66,7 @@ type Video struct { // integer; recommended // Description: // Width of the video player in device independent pixels (DIPS). - W uint64 `json:"w,omitempty"` + W int `json:"w,omitempty"` // Attribute: // h @@ -74,7 +74,7 @@ type Video struct { // integer; recommended // Description: // Height of the video player in device independent pixels (DIPS). - H uint64 `json:"h,omitempty"` + H int `json:"h,omitempty"` // Attribute: // startdelay @@ -169,7 +169,7 @@ type Video struct { // integer // Description: // Minimum bit rate in Kbps. - MinBitRate uint64 `json:"minbitrate,omitempty"` + MinBitRate int `json:"minbitrate,omitempty"` // Attribute: // maxbitrate @@ -177,7 +177,7 @@ type Video struct { // integer // Description: // Maximum bit rate in Kbps. - MaxBitRate uint64 `json:"maxbitrate,omitempty"` + MaxBitRate int `json:"maxbitrate,omitempty"` // Attribute: // boxingallowed