PSDTranslator: Implemented DataArray class for export improvements

src/add-ons/translators/psd/DataArray.cpp

@@ -0,0 +1,216 @@
+/*
+ * Copyright 2013, Gerasim Troeglazov, 3dEyes@gmail.com. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include "DataArray.h"
+
+
+BDataArray::BDataArray(int32 blockSize)
+{
+	fBlockSize = blockSize;
+	fData = (uint8*)malloc(blockSize);
+	fAllocatedDataSize = blockSize;
+	fDataSize = 0;
+}
+
+
+BDataArray::~BDataArray()
+{
+	free(fData);
+}
+
+
+status_t
+BDataArray::_ReallocArrayFor(int32 size)
+{
+	if (fDataSize + size > fAllocatedDataSize) {
+		int32 blocks = ((fDataSize + size) / fBlockSize) + 1;
+		uint8 *newData = (uint8*)realloc(fData, blocks * fBlockSize);
+		if (newData != NULL) {
+			fData = newData;
+			fAllocatedDataSize = blocks * fBlockSize;
+		}
+	}
+	return fData == NULL ? B_NO_MEMORY : B_OK;
+}
+
+
+uint8*
+BDataArray::Buffer(void)
+{
+	return fData;
+}
+
+
+int32
+BDataArray::Length(void)
+{
+	return fDataSize;
+}
+
+
+ssize_t
+BDataArray::WriteToStream(BPositionIO *stream)
+{
+	return stream->Write(fData, fDataSize);
+}
+
+
+status_t
+BDataArray::Append(uint8 val)
+{
+	status_t status = _ReallocArrayFor(sizeof(val));
+	if (status != B_OK)
+		return status;
+	fData[fDataSize] = val;
+	fDataSize++;
+	return B_OK;
+}
+
+
+status_t
+BDataArray::Append(int8 val)
+{
+	return Append((uint8)val);
+}
+
+
+status_t
+BDataArray::Append(uint16 val)
+{
+	status_t status = _ReallocArrayFor(sizeof(val));
+	if (status != B_OK)
+		return status;
+	val = B_HOST_TO_BENDIAN_INT16(val);
+	memcpy(fData + fDataSize, &val, sizeof(val));
+	fDataSize += sizeof(val);
+	return B_OK;	
+}
+
+
+status_t
+BDataArray::Append(int16 val)
+{
+	return Append((uint16)val);
+}
+
+
+status_t
+BDataArray::Append(uint32 val)
+{
+	status_t status = _ReallocArrayFor(sizeof(val));
+	if (status != B_OK)
+		return status;
+	val = B_HOST_TO_BENDIAN_INT32(val);
+	memcpy(fData + fDataSize, &val, sizeof(val));
+	fDataSize += sizeof(val);
+	return B_OK;
+}
+
+
+status_t
+BDataArray::Append(int32 val)
+{
+	return Append((uint32)val);
+}
+
+
+status_t
+BDataArray::Append(const char *str)
+{
+	int32 len = strlen(str);
+	status_t status = _ReallocArrayFor(len);
+	if (status != B_OK)
+		return status;
+	memcpy(fData + fDataSize, str, len);
+	fDataSize += len;
+	return B_OK;	
+}
+
+
+status_t
+BDataArray::Append(BString str)
+{
+	return Append(str.String());
+}
+
+
+status_t
+BDataArray::Append(uint8 *ptr, int32 len)
+{
+	status_t status = _ReallocArrayFor(len);
+	if (status != B_OK)
+		return status;
+	memcpy(fData + fDataSize, ptr, len);
+	fDataSize += len;
+	return B_OK;
+}
+
+
+status_t
+BDataArray::Repeat(uint8 byte, int32 count)
+{
+	status_t status = _ReallocArrayFor(count);
+	if (status != B_OK)
+		return status;
+	memset(fData + fDataSize, byte, count);
+	fDataSize += count;
+	return B_OK;	
+}
+
+
+BDataArray&
+BDataArray::operator<<(int8 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(uint8 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(int16 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(uint16 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(int32 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(uint32 val)
+{
+	Append(val);
+	return *this;
+}
+
+
+BDataArray&
+BDataArray::operator<<(const char* str)
+{
+	Append(str);
+	return *this;
+}

src/add-ons/translators/psd/DataArray.h

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013, Gerasim Troeglazov, 3dEyes@gmail.com. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#ifndef PSD_DATA_ARRAY_H
+#define PSD_DATA_ARRAY_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <String.h>
+#include <DataIO.h>
+#include <File.h>
+#include <ByteOrder.h>
+
+#define DATAARRAY_BLOCK_SIZE 1024
+
+class BDataArray {
+public:
+					BDataArray(int32 blockSize = DATAARRAY_BLOCK_SIZE);
+					~BDataArray();
+
+	status_t		Append(int8 val);
+	status_t		Append(uint8 val);
+	status_t		Append(int16 val);
+	status_t		Append(uint16 val);
+	status_t		Append(int32 val);
+	status_t		Append(uint32 val);
+	status_t		Append(const char *str);
+	status_t		Append(BString str);
+	status_t		Append(uint8 *ptr, int32 len);
+	
+	status_t		Repeat(uint8 byte, int32 count);
+
+	BDataArray&		operator<<(int8);
+	BDataArray&		operator<<(uint8);
+	BDataArray&		operator<<(int16);
+	BDataArray&		operator<<(uint16);
+	BDataArray&		operator<<(int32);
+	BDataArray&		operator<<(uint32);
+	BDataArray&		operator<<(const char*);
+
+	uint8			*Buffer(void);
+	int32			Length(void);
+
+	ssize_t			WriteToStream(BPositionIO *stream);
+
+private:
+	inline status_t	_ReallocArrayFor(int32 size);
+
+	uint8			*fData;
+	int32			fDataSize;
+	int32			fAllocatedDataSize;
+	int32			fBlockSize;
+};
+
+
+#endif	/* PSD_DATA_ARRAY_H */

src/add-ons/translators/psd/Jamfile

@@ -14,6 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			PSDTranslator.cpp
 			PSDLoader.cpp
 			PSDWriter.cpp
+			DataArray.cpp
 			ConfigView.cpp
 			: be translation 
 			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
@@ -30,5 +31,6 @@ DoCatalogs PSDTranslator :
 	PSDTranslator.cpp
 	PSDLoader.cpp
 	PSDWriter.cpp
+	DataArray.cpp
 	ConfigView.cpp
 ;