fiftyone-devicedetection-onpremise 4.5.0a28__tar.gz → 4.5.0a30__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a28
+Version: 4.5.0a30
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/collection.c

@@ -517,10 +517,10 @@ static CollectionFile* readFile(CollectionFile *fileCollection, FILE *file) {
 	}
 
 	// Record the offset in the source file to the collection.
-	fileCollection->offset = ftell(file);
+	fileCollection->offset = FileTell(file);
 
 	// Move the file handle past the collection.
-	if (fseek(file, fileCollection->collection->size, SEEK_CUR) != 0) {
+	if (FileSeek(file, fileCollection->collection->size, SEEK_CUR) != 0) {
 		return NULL;
 	}
 
@@ -596,7 +596,7 @@ static Collection* createFromFilePartial(
 	memory->memoryToFree = memory->firstByte;
 
 	// Position the file reader at the start of the collection.
-	if (fseek(file, header->startPosition, SEEK_SET) != 0) {
+	if (FileSeek(file, header->startPosition, SEEK_SET) != 0) {
 		freeMemoryCollection(collection);
 		source->freeCollection(source);
 		return NULL;
@@ -611,7 +611,7 @@ static Collection* createFromFilePartial(
 	}
 
 	// Move the file position to the byte after the collection.
-	if (fseek(file, source->size - memory->collection->size, SEEK_CUR) != 0) {
+	if (FileSeek(file, source->size - memory->collection->size, SEEK_CUR) != 0) {
 		freeMemoryCollection(collection);
 		source->freeCollection(source);
 		return NULL;
@@ -702,7 +702,7 @@ static Collection* createFromFileSecond(
 
 	// Return the file position to the start of the collection ready to
 	// read the next collection.
-	if (fseek(file, header.startPosition, SEEK_SET) == 0) {
+	if (FileSeek(file, header.startPosition, SEEK_SET) == 0) {
 
 		// Choose between the cached or file based collection.
 		if (config->capacity > 0 && config->concurrency > 0) {
@@ -748,7 +748,7 @@ fiftyoneDegreesCollectionHeader fiftyoneDegreesCollectionHeaderFromMemory(
 
 	// Advance the memory reader and record the start of the collection.
 	if (MemoryAdvance(reader, sizeof(uint32_t))) {
-		header.startPosition = (uint32_t)(reader->current - reader->startByte);
+		header.startPosition = (FileOffsetUnsigned)(reader->current - reader->startByte);
 	}
 	else {
 		header.startPosition = 0;
@@ -762,7 +762,7 @@ fiftyoneDegreesCollection* fiftyoneDegreesCollectionCreateFromMemory(
 	fiftyoneDegreesCollectionHeader header) {
 
 	// Validate the header and the reader are in sync at the correct position.
-	if ((uint32_t)(reader->current - reader->startByte) !=
+	if ((FileOffsetUnsigned)(reader->current - reader->startByte) !=
 		header.startPosition) {
 		return NULL;
 	}
@@ -829,7 +829,7 @@ fiftyoneDegreesCollectionHeader fiftyoneDegreesCollectionHeaderFromFile(
 			header.length = sizeOrCount;
 			header.count = elementSize > 0 ? header.length / elementSize : 0;
 		}
-		header.startPosition = (uint32_t)ftell(file);
+		header.startPosition = (FileOffsetUnsigned)FileTell(file);
 	}
 	else {
 		header.startPosition = 0;
@@ -876,7 +876,7 @@ fiftyoneDegreesCollection* fiftyoneDegreesCollectionCreateFromFile(
 
 	if (result == NULL || (
 		result->count == config->loaded &&
-		(long)result->size < (long)(ftell(file) - header.startPosition))) {
+		(FileOffset)result->size < (FileTell(file) - (FileOffset)header.startPosition))) {
 
 		// Create the next collection if one is needed.
 		*next = createFromFileSecond(file, reader, config, header, read);
@@ -910,11 +910,11 @@ fiftyoneDegreesCollection* fiftyoneDegreesCollectionCreateFromFile(
 	}
 	
 	memory.startByte = memory.current;
-	memory.length = (long)header.length;
+	memory.length = (FileOffset)header.length;
 	memory.lastByte = memory.current + memory.length;
 
 	// Position the file reader at the start of the collection.
-	if (fseek(file, header.startPosition, SEEK_SET) != 0) {
+	if (FileSeek(file, header.startPosition, SEEK_SET) != 0) {
 		free(data);
 		return NULL;
 	}
@@ -961,7 +961,7 @@ fiftyoneDegreesFileHandle* fiftyoneDegreesCollectionReadFilePosition(
 
 			// Move to the start of the record in the file handling success or 
 			// failure of the operation via the status code.
-			if (fseek(handle->file, file->offset + offset, SEEK_SET) != 0) {
+			if (FileSeek(handle->file, file->offset + offset, SEEK_SET) != 0) {
 
 				// Release the handle as the operation failed.
 				FileHandleRelease(handle);
@@ -1048,7 +1048,7 @@ static void* readFileVariable(
 	void *ptr = NULL;
 
 	// Set the file position to the start of the item being read.
-	if (fseek(handle->file, fileCollection->offset + offset, SEEK_SET) == 0) {
+	if (FileSeek(handle->file, fileCollection->offset + offset, SEEK_SET) == 0) {
 
 		// Read the item header minus the last part of the structure 
 		// that may not always be included with every item.

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/collection.h

@@ -246,7 +246,6 @@
 #include "common.h"
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 
 /**
  * Free a collection by checking if it is NULL first.
@@ -272,9 +271,9 @@ if (c != NULL) { c->freeCollection(c); }
  * Collection header structure which defines the size and location of the
  * collection data.
  */
-#pragma pack(push, 4)
+#pragma pack(push, 1)
 typedef struct fiftyone_degrees_collection_header_t {
-	uint32_t startPosition; /**< Start position in the data file of the entities */
+	fiftyoneDegreesFileOffsetUnsigned startPosition; /**< Start position in the data file of the entities */
 	uint32_t length; /**< Length in bytes of all the entities */
 	uint32_t count; /**< Number of entities in the collection */
 } fiftyoneDegreesCollectionHeader;
@@ -319,7 +318,7 @@ typedef struct fiftyone_degrees_collection_item_t {
  * if the item could not be loaded. The exception parameter is set to the 
  * status code to indicate the failure.
  * @param collection pointer to the file collection
- * @param offsetOrIndex index or offset to the item in the data structure
+ * @param indexOrOffset index or offset to the item in the data structure
  * @param item pointer to the item structure to place the result in
  * @param exception pointer to an exception data structure to be used if an
  * exception occurs. See exceptions.h.
@@ -446,7 +445,7 @@ typedef struct fiftyone_degrees_collection_file_t {
 	fiftyoneDegreesCollection *collection; /**< The generic collection */
 	fiftyoneDegreesFilePool *reader; /**< Reader used to load items into the 
 									 cache, or NULL if no cache */
-	long offset; /**< Offset to the collection in the source data structure */
+	fiftyoneDegreesFileOffset offset; /**< Offset to the collection in the source data structure */
 	fiftyoneDegreesCollectionFileRead read; /**< Read method used to read an
 											item from file at an offset or
 											index */

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/component.c

@@ -44,7 +44,7 @@ uint32_t fiftyoneDegreesComponentGetDefaultProfileId(
 		&profileItem,
 		exception);
 	if (profile != NULL && EXCEPTION_OKAY) {
-		profileId = (uint32_t)profile->profileId;
+		profileId = profile->profileId;
 		COLLECTION_RELEASE(profiles, &profileItem);
 	}
 	return profileId;

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h

@@ -113,6 +113,8 @@ MAP_TYPE(CollectionCache)
 MAP_TYPE(CollectionFileRead)
 #endif
 MAP_TYPE(FileHandle)
+MAP_TYPE(FileOffset)
+MAP_TYPE(FileOffsetUnsigned)
 MAP_TYPE(CacheNode)
 MAP_TYPE(FilePool)
 MAP_TYPE(CollectionHeader)
@@ -254,6 +256,8 @@ MAP_TYPE(WkbtotResult)
 #define HeadersFree fiftyoneDegreesHeadersFree /**< Synonym for #fiftyoneDegreesHeadersFree function. */
 #define PropertiesFree fiftyoneDegreesPropertiesFree /**< Synonym for #fiftyoneDegreesPropertiesFree function. */
 #define FilePoolRelease fiftyoneDegreesFilePoolRelease /**< Synonym for #fiftyoneDegreesFilePoolRelease function. */
+#define FileSeek fiftyoneDegreesFileSeek /**< Synonym for #fiftyoneDegreesFileSeek function. */
+#define FileTell fiftyoneDegreesFileTell /**< Synonym for #fiftyoneDegreesFileTell function. */
 #define FileDelete fiftyoneDegreesFileDelete /**< Synonym for #fiftyoneDegreesFileDelete function. */
 #define FilePoolReset fiftyoneDegreesFilePoolReset /**< Synonym for #fiftyoneDegreesFilePoolReset function. */
 #define PropertiesCreate fiftyoneDegreesPropertiesCreate /**< Synonym for #fiftyoneDegreesPropertiesCreate function. */

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.c

@@ -28,6 +28,7 @@
 #ifdef _MSC_VER
 #include <windows.h>
 #else
+#include <stdio.h>
 #include <unistd.h>
 #endif
 
@@ -77,14 +78,48 @@ static void freeFileHandle(Pool *pool, void *fileHandle) {
 #pragma warning (default:4100)  
 #endif
 
-static long fileGetSize(FILE *file) {
+int fiftyoneDegreesFileSeek(
+   FILE * const stream,
+   const FileOffset offset,
+   const int origin) {
+
+	return
+#ifdef FIFTYONE_DEGREES_LARGE_DATA_FILE_SUPPORT
+#	ifdef _MSC_VER
+	_fseeki64
+#	else
+	fseeko
+#	endif
+#else
+	fseek
+#endif
+	(stream, offset, origin);
+}
+
+FileOffset fiftyoneDegreesFileTell(FILE * const stream) {
+
+	return
+#ifdef FIFTYONE_DEGREES_LARGE_DATA_FILE_SUPPORT
+#	ifdef _MSC_VER
+	_ftelli64
+#	else
+	ftello
+#	endif
+#else
+	ftell
+#endif
+	(stream);
+}
+
+
+static FileOffset fileGetSize(FILE *file) {
 	if (fseek(file, 0L, SEEK_END) == 0) {
-		return ftell(file);
+		return FileTell(file);
 	}
 	return -1;
 }
 
-static long setLength(FilePool *reader, Exception *exception) {
+static FileOffset setLength(FilePool *reader, Exception *exception) {
 	FileHandle *handle;
 	reader->length = 0;
 	handle = FileHandleGet(reader, exception);
@@ -259,7 +294,7 @@ static bool compareFiles(
 	long bytesToCompare) {
 	StatusCode status;
 	FILE *file, *otherFile;
-	long size, read;
+	FileOffset size, read;
 	byte buffer[1024], otherBuffer[1024];
 
 	// Compare the sizes.
@@ -278,11 +313,11 @@ static bool compareFiles(
 		return false;
 	}
 
-	while (ftell(file) < size &&
-		(bytesToCompare < 0 || ftell(file) < bytesToCompare)) {
+	while (FileTell(file) < size &&
+		(bytesToCompare < 0 || FileTell(file) < bytesToCompare)) {
 		read = bytesToCompare > 0 ? bytesToCompare : (long)sizeof(buffer);
-		if (size - ftell(file) < read) {
-			read = size - ftell(file);
+		if (size - FileTell(file) < read) {
+			read = size - FileTell(file);
 		}
 
 		if (fread(buffer, read, 1, file) != 1) {
@@ -1041,9 +1076,9 @@ fiftyoneDegreesStatusCode fiftyoneDegreesFileCopy(
 	return status;
 }
 
-long fiftyoneDegreesFileGetSize(const char *source) {
+FileOffset fiftyoneDegreesFileGetSize(const char *source) {
 	FILE *sourceFile;
-	long size = -1;
+	FileOffset size = -1;
 	if (FileOpen(source, &sourceFile) == SUCCESS) {
 		size = fileGetSize(sourceFile);
 		fclose(sourceFile);

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.h

@@ -171,6 +171,7 @@
 #include <limits.h>
 #include <time.h>
 #include "data.h"
+#include "fileOffset.h"
 #include "exceptions.h"
 #include "status.h"
 #include "memory.h"
@@ -213,6 +214,7 @@
 #define FIFTYONE_DEGREES_FILE_MAX_PATH 4096
 #endif
 
+
 /**
  * File handle node in the stack of handles.
  */
@@ -226,9 +228,30 @@ typedef union fiftyone_degrees_file_handle_t {
  */
  typedef struct fiftyone_degrees_file_pool_t {
 	 fiftyoneDegreesPool pool; /**< The pool of file handles */
-	 long length; /**< Length of the file in bytes */
+	 fiftyoneDegreesFileOffset length; /**< Length of the file in bytes */
 } fiftyoneDegreesFilePool;
 
+/**
+ * Moves the file pointer to a specified location.
+ * @param stream Pointer to FILE structure.
+ * @param offset Number of bytes from origin.
+ * @param origin Initial position.
+ * @return 
+ */
+EXTERNAL int fiftyoneDegreesFileSeek(
+   FILE *stream,
+   fiftyoneDegreesFileOffset offset,
+   int origin);
+
+/**
+ * Gets the current position of a file pointer.
+ * @param stream Target FILE structure.
+ * @return The current file position.
+ */
+EXTERNAL fiftyoneDegreesFileOffset fiftyoneDegreesFileTell(
+   FILE *stream
+);
+
 /**
  * Releases the file handles contained in the pool and frees any internal
  * memory used by the pool. Does not free the memory pointed to by pool.
@@ -455,7 +478,7 @@ EXTERNAL void fiftyoneDegreesFileHandleRelease(
  * @param fileName path to the file
  * @return size of file in bytes or -1
  */
-EXTERNAL long fiftyoneDegreesFileGetSize(const char *fileName);
+EXTERNAL fiftyoneDegreesFileOffset fiftyoneDegreesFileGetSize(const char *fileName);
 
 /**
  * Reads the contents of a file into memory. The correct amount of memory will

fiftyone_devicedetection_onpremise-4.5.0a30/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fileOffset.h

@@ -0,0 +1,74 @@
+/* *********************************************************************
+ * This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2025 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
+ * ********************************************************************* */
+
+#ifndef FIFTYONE_DEGREES_FILE_OFFSET_H_INCLUDED
+#define FIFTYONE_DEGREES_FILE_OFFSET_H_INCLUDED
+
+/**
+ * @ingroup FiftyOneDegreesCommon
+ * @defgroup FiftyOneDegreesFile FileOffset
+ *
+ * `FileOffset` offset types:
+ * - signed `FileOffset` -- for interop with native API (fseek/ftell)
+ * - unsigned `FileOffsetUnsigned` -- as present in data file
+ *
+ *
+ * if FIFTYONE_DEGREES_LARGE_DATA_FILE_SUPPORT macro is defined,
+ * both types will be 64-bit.
+ *
+ * Motivation for this is that an offset in a large file
+ * beyond 4GB is not addressable by a `uint32_t` variable.
+ *
+ * For files smaller than 4GB `uint32_t` is fully sufficient to address an offset.
+ *
+ * `fseek`/`ftell` functions MAY also fail on files larger than 2 GiB
+ * due to the limitations of `long int` type used,
+ * so enabling the option MIGHT be necessary in those cases as well.
+ *
+ * On POSIX systems `_FILE_OFFSET_BITS` should be defined as `64` at the same time
+ * for `off_t` (used by `fseeko`/`ftello` from `<stdio.h>`) to be 64-bit as well.
+ *
+ * @{
+ */
+
+#include <stdint.h>
+
+typedef
+#ifdef FIFTYONE_DEGREES_LARGE_DATA_FILE_SUPPORT
+uint64_t
+#else
+uint32_t
+#endif
+fiftyoneDegreesFileOffsetUnsigned; /**< Type for collection start offset (in file). [unsigned] */
+
+typedef
+#ifdef FIFTYONE_DEGREES_LARGE_DATA_FILE_SUPPORT
+int64_t
+#else
+long
+#endif
+fiftyoneDegreesFileOffset; /**< Type for file offset in API. [signed] */
+
+/**
+ * @}
+ */
+#endif

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/memory.h

@@ -40,6 +40,7 @@
 #include "threading.h"
 #include "tree.h"
 #include "common.h"
+#include "fileOffset.h"
 
 #ifdef _MSC_VER
 #define FIFTYONE_DEGREES_CALL_CONV __cdecl
@@ -54,7 +55,7 @@ typedef struct fiftyone_degrees_memory_reader_t {
 	byte *startByte; /**< The first byte in memory */
 	byte *current; /**< The current byte being read from */
 	byte *lastByte; /**< The maximum byte that can be read from */
-	long length; /**< Length of the file in bytes */
+	fiftyoneDegreesFileOffset length; /**< Length of the file in bytes */
 } fiftyoneDegreesMemoryReader;
 
 /**

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/storedBinaryValue.c

@@ -44,6 +44,12 @@ static uint32_t getFinalIntegerSize(void *initial) {
 
 #ifndef FIFTYONE_DEGREES_MEMORY_ONLY
 
+/**
+ * Type for temporary memory keeping the value of
+ * `storedValueType`: `fiftyoneDegreesPropertyValueType`
+ * for "File" and/or "Partial" collections
+ * between calls from `StoredBinaryValueGet` to `StoredBinaryValueRead`.
+ */
 typedef uint8_t PropertyValueTypeInData;
 
 void* fiftyoneDegreesStoredBinaryValueRead(
@@ -52,10 +58,20 @@ void* fiftyoneDegreesStoredBinaryValueRead(
     fiftyoneDegreesData * const data,
     fiftyoneDegreesException * const exception) {
     int16_t length;
+
+    // When collection getter is called from `StoredBinaryValueRead`,
+    // the latter will save `storedValueType` into item's Data.
+    //
+    // Otherwise -- if the data is in clear state (e.g. after DataReset),
+    // the caller is assumed to have requested a "String" value.
+    // (for compatibility with `StringRead`-initialized collections).
+
     if (data->used < sizeof(PropertyValueTypeInData)) {
-        // stored value type not known
+        // stored value type not known,
+        // => assume String
         return fiftyoneDegreesStringRead(file, offset, data, exception);
     };
+
     const PropertyValueType storedValueType = *(const PropertyValueTypeInData *)data->ptr;
     switch (storedValueType) {
         case FIFTYONE_DEGREES_PROPERTY_VALUE_TYPE_STRING: {
@@ -108,15 +124,61 @@ StoredBinaryValue* fiftyoneDegreesStoredBinaryValueGet(
     fiftyoneDegreesCollectionItem *item,
     Exception *exception) {
 
+#ifndef FIFTYONE_DEGREES_MEMORY_ONLY
+    // CollectionReadFileVariable subroutine needs to know
+    // - how many bytes constitute the "header" of the variable
+    // - how to extract the remaining "length" of the variable from the "header"
+    //
+    // for that we must pass `storedValueType`
+
+    // Allocate a memory to hold `storedValueType` on stack.
+    //
+    // Use an array to prevent a warning
+    // > `pointer to a local variable potentially escaping scope`
+    //
+    // The data will either:
+    // - remain unowned
+    //   (and `ptr` won't be dereferenced),
+    // or
+    // - is already owned and considered disposable
+    //   (so `storedValueType` will be copied, and no escaping will occur).
+
     PropertyValueTypeInData storedValueTypeInData[1] = { storedValueType };
-    if (item->data.allocated) {
-        DataMalloc(&item->data, sizeof(uint32_t));
-        *((PropertyValueTypeInData*)item->data.ptr) = storedValueTypeInData[0];
-    } else {
+
+    if (!item->data.allocated) {
+        // It is assumed -- as part of the Collection-CollectionItem contract --
+        // that data of the Item passed into "get" is NOT owned by that item.
+
         item->data.ptr = (byte *)&storedValueTypeInData[0];
+    } else {
+        // Since _this_ function _technically_ is NOT a "getter method"
+        // we might still get an Item that owns some memory.
+        //
+        // Since no collection would leave Data pointing to internal memory
+        // (past COLLECTION_RELEASE call -- mandatory for Item to be reused)
+        // assume the Data is disposable.
+        //
+        // Ensure Data is of sufficient size and copy `storedValueType` into it.
+
+        DataMalloc(&item->data, sizeof(PropertyValueTypeInData));
+        *((PropertyValueTypeInData*)item->data.ptr) = storedValueTypeInData[0];
     }
     item->data.used = sizeof(PropertyValueTypeInData);
 
+#else
+    // In MEMORY_ONLY mode,
+    //
+    // we only need to get the pointer to beginning of the data structure
+    // inside the whole body of the data file.
+    //
+    // `storedValueType` is not used, since we do not need to allocate
+    // a sufficient (unknown before reading starts) amount of memory
+    // to read the bytes into.
+#	ifdef _MSC_VER
+    UNREFERENCED_PARAMETER(storedValueType);
+#	endif
+#endif
+
     StoredBinaryValue * const result = strings->get(
         strings,
         offset,

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/FixedSizeCollection.hpp

@@ -25,6 +25,7 @@
 
 #include "../collection.h"
 #include "../string.h"
+#include "../fileOffset.h"
 #include <vector>
 
 typedef struct fixed_size_collection_state_t {
@@ -63,7 +64,7 @@ FixedSizeCollection<T>::FixedSizeCollection(const std::vector<T> &values) {
     size_t dataLength = values.size() * sizeof(T);
     state.count = (uint32_t) values.size();
     
-    reader.length = (long)(dataLength + sizeof(uint32_t));
+    reader.length = (fiftyoneDegreesFileOffset)(dataLength + sizeof(uint32_t));
     state.data = fiftyoneDegreesMalloc(reader.length);
     *(int32_t*)state.data = (int32_t)dataLength;
     state.offsets = (uint32_t*)fiftyoneDegreesMalloc(values.size() * sizeof(uint32_t));

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/VariableSizeCollection.hpp

@@ -63,7 +63,7 @@ VariableSizeCollection<T>::VariableSizeCollection(const std::vector<T> &values)
     size_t dataLength = values.size() * sizeof(T);
     state.count = (uint32_t) values.size();
     
-    reader.length = (long)(dataLength + sizeof(uint32_t));
+    reader.length = (FileOffset)(dataLength + sizeof(uint32_t));
     state.data = fiftyoneDegreesMalloc(reader.length);
     *(int32_t*)state.data = (int32_t)dataLength;
     state.offsets = (uint32_t*)fiftyoneDegreesMalloc(values.size() * sizeof(uint32_t));

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone-devicedetection-onpremise
-Version: 4.5.0a28
+Version: 4.5.0a30
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a28 → fiftyone_devicedetection_onpremise-4.5.0a30}/src/fiftyone_devicedetection_onpremise.egg-info/SOURCES.txt

@@ -118,6 +118,7 @@ src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/exceptionsc.c
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fiftyone.h
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.c
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/file.h
+src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/fileOffset.h
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/float.c
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/float.h
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/headers.c

fiftyone_devicedetection_onpremise-4.5.0a30/version.txt

@@ -0,0 +1 @@
+4.5.0-alpha.30

fiftyone_devicedetection_onpremise-4.5.0a28/version.txt

@@ -1 +0,0 @@
-4.5.0-alpha.28