From 45de6c40dcfc6fd1107096eaba34b2a652ac5856 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 30 Nov 2016 11:41:32 +0000 Subject: [PATCH] Remove dead code (archive.cpp) Change-Id: Iac020ffbfd0b60b790f076778625c5c33d5785d1 --- dali/internal/event/resources/archive.cpp | 522 ------------------------------ dali/internal/event/resources/archive.h | 283 ---------------- dali/internal/file.list | 1 - 3 files changed, 806 deletions(-) delete mode 100644 dali/internal/event/resources/archive.cpp delete mode 100644 dali/internal/event/resources/archive.h diff --git a/dali/internal/event/resources/archive.cpp b/dali/internal/event/resources/archive.cpp deleted file mode 100644 index fe163c6..0000000 --- a/dali/internal/event/resources/archive.cpp +++ /dev/null @@ -1,522 +0,0 @@ -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// CLASS HEADER -#include - -// EXTERNAL INCLUDES -#include -#include - -// INTERNAL INCLUDES -#include -#include -#include -#include -#include -#include -#include - -namespace Dali -{ - -namespace Internal -{ - -/*--------- Archive ---------*/ - -Archive::Archive(std::streambuf& buf) -: mVersion(0), - mStream(&buf), - mResult(true) -{ -} - -Archive::~Archive() -{ - if(!mChunkStack.empty()) - { - DALI_LOG_ERROR("mChunkStack should be empty!\n"); - } -} - - -/*--------- OutputArchive ---------*/ - -OutputArchive::OutputArchive(std::streambuf& buf, const unsigned int version) -: Archive(buf) -{ - SetVersion(version); -} - -OutputArchive::~OutputArchive() -{ -} - -bool OutputArchive::Write(const char* data, const unsigned int length) -{ - if( mResult ) - { - mStream.write(data, length); - if( mStream.bad() ) - { - mResult = false; - } - } - return mResult; -} - -bool OutputArchive::OpenChunk(const unsigned int fourCC) -{ - const unsigned int zero = 0; - - // Get current position in stream - std::streampos currentPos = mStream.tellp(); - - // Ensure chunk will start at an even byte - // (necessary for nested chunks) - if( currentPos & 1 ) - { - const char padding = 0; - Write(&padding, sizeof(char)); - } - - // Write chunk header to stream - Write(reinterpret_cast(&fourCC), sizeof(unsigned int)); - - // Push chunkHeader information to chunk LIFO stack - mChunkStack.push(std::make_pair(fourCC, mStream.tellp())); - - // Write zero for chunk length temporarily. This will be overwritten in CloseChunk - Write(reinterpret_cast(&zero), sizeof(unsigned int)); - - return mResult; -} - -void OutputArchive::CloseChunk() -{ - // Get current position in stream - std::streampos currentPos = mStream.tellp(); - - // retrieve chunk header - ChunkHeader chunkHeader = mChunkStack.top(); - mChunkStack.pop(); - - // seek to chunk header in stream - mStream.seekp(chunkHeader.second); - - // calculate and write chunk size - unsigned int chunkLength = static_cast(currentPos - chunkHeader.second) - sizeof(unsigned int); - Write(reinterpret_cast(&chunkLength), sizeof(unsigned int)); - - // return to current position in stream - mStream.seekp(currentPos); - - // Ensure next chunk will start at on even byte - if( currentPos & 1 ) - { - const char padding = 0; - Write(&padding, 1); - } -} - - -/*--------- InputArchive ---------*/ - -InputArchive::InputArchive(std::streambuf& buf, const unsigned int version) -: Archive(buf), - mFileVersion(0) -{ - SetVersion(version); -} - -InputArchive::~InputArchive() -{ -} - -bool InputArchive::Read(char* data, const unsigned int length) -{ - if( mResult ) - { - mStream.read(data, length); - if( mStream.bad() ) - { - mResult = false; - } - } - return mResult; -} - -bool InputArchive::OpenChunk(const unsigned int fourCC) -{ - if( PeekChunk() != fourCC ) - { - // trying to open incorrect chunk, mark archive error - mResult = false; - return mResult; - } - - union - { - unsigned int fourCC_int; - char fourCC_char[4]; - }; - fourCC_int = 0; - - if( mStream.tellg() & 1 ) - { - mStream.seekg(1, std::ios_base::cur); - } - - Read(fourCC_char, sizeof(unsigned int)); - - // Push chunkHeader information to chunk LIFO stack - mChunkStack.push(std::make_pair(fourCC_int, mStream.tellg())); - -# if defined(DEBUG_ENABLED) - - unsigned int chunkLength; - Read(reinterpret_cast(&chunkLength), sizeof(unsigned int)); - - DALI_LOG_INFO(Debug::Filter::gModel, Debug::Verbose, "Enter: %c%c%c%c(%d)\n", - fourCC_char[0], fourCC_char[1], fourCC_char[2], fourCC_char[3], chunkLength); - -# else // defined(DEBUG_ENABLED) - - // skip chunk length - mStream.seekg(sizeof(unsigned int), std::ios_base::cur); - -# endif // defined(DEBUG_ENABLED) - - return mResult; -} - -void InputArchive::SkipChunk(const unsigned int fourCC) -{ - // Ensure the next chunk is the correct one - if( PeekChunk() != fourCC ) - { - return; - } - - union - { - unsigned int fourCC_int; - char fourCC_char[4]; - }; - unsigned int chunkLength; - - if( mStream.tellg() & 1 ) - { - mStream.seekg(1, std::ios_base::cur); - } - - Read(fourCC_char, sizeof(unsigned int)); - Read(reinterpret_cast(&chunkLength), sizeof(unsigned int)); - - DALI_LOG_INFO(Debug::Filter::gModel, Debug::Verbose, "Enter: %c%c%c%c(%d)\n", - fourCC_char[0], fourCC_char[1], fourCC_char[2], fourCC_char[3], chunkLength); - - if( chunkLength & 1 ) - { - ++chunkLength; - } - - mStream.seekg(chunkLength, std::ios_base::cur); -} - -void InputArchive::CloseChunk() -{ - ChunkHeader chunkHeader = mChunkStack.top(); - mChunkStack.pop(); - - mStream.seekg(chunkHeader.second); - - unsigned int chunkLength; - Read(reinterpret_cast(&chunkLength), sizeof(unsigned int)); - - if( chunkLength & 1) - { - ++chunkLength; - } - mStream.seekg(chunkLength, std::ios_base::cur); -} - -unsigned int InputArchive::PeekChunk() -{ - union - { - unsigned int fourCC_int; - char fourCC_char[4]; - }; - fourCC_int = 0; - - // Get current position in stream - std::streampos currentPos = mStream.tellg(); - - // Ensure next read will be from an even byte - if( currentPos & 1 ) - { - mStream.seekg(1, std::ios_base::cur); - } - - // Read tag - Read(fourCC_char, sizeof(unsigned int)); - -# if defined(DEBUG_ENABLED) - unsigned int chunkLength; - Read(reinterpret_cast(&chunkLength), sizeof(unsigned int)); - - DALI_LOG_INFO(Debug::Filter::gModel, Debug::Verbose, "Peek: %c%c%c%c(%d)\n", - fourCC_char[0], fourCC_char[1], fourCC_char[2], fourCC_char[3], chunkLength); -# endif // defined(DEBUG_ENABLED) - - // return to original position in stream - mStream.seekg(currentPos); - - return fourCC_int; -} - -namespace Serialize -{ -/*------ serialization overrides of operator<< () and operator>> () ------*/ - -Archive& operator<< (Archive& ar, const char& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, char& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator<< (Archive& ar, const unsigned char& t) -{ - ar.Write((char*)&t, sizeof(t)); - return ar; -} - -Archive& operator>> (Archive& ar, unsigned char& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator<< (Archive& ar, const bool& t) -{ - char value = t ? 1 : 0; - ar.Write(&value, sizeof(value)); - return ar; -} - -Archive& operator>> (Archive& ar, bool& t) -{ - char value; - ar.Read(&value, sizeof(value)); - t = value != 0; - - return ar; -} - -Archive& operator<< (Archive& ar, const short& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, short& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator<< (Archive& ar, const unsigned short& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, unsigned short& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator<< (Archive& ar, const int& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, int& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator<< (Archive& ar, const unsigned int& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, unsigned int& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -// float -Archive& operator<< (Archive& ar, const float& t) -{ - ar.Write((char*)&t, sizeof(t)); - - return ar; -} - -Archive& operator>> (Archive& ar, float& t) -{ - ar.Read((char*)&t, sizeof(t)); - - return ar; -} - -// Vector2 -Archive& operator<< (Archive& ar, const Vector2& t) -{ - ar << t.x << t.y; - return ar; -} - -Archive& operator>> (Archive& ar, Vector2& t) -{ - ar >> t.x >> t.y; - return ar; -} - -// Vector3 -Archive& operator<< (Archive& ar, const Vector3& t) -{ - ar << t.x << t.y << t.z; - return ar; -} - -Archive& operator>> (Archive& ar, Vector3& t) -{ - ar >> t.x >> t.y >> t.z; - return ar; -} - -// Vector4 -Archive& operator<< (Archive& ar, const Vector4& t) -{ - ar << t.x << t.y << t.z << t.w; - return ar; -} - -Archive& operator>> (Archive& ar, Vector4& t) -{ - ar >> t.x >> t.y >> t.z >> t.w; - return ar; -} - -// Quaternion -Archive& operator<< (Archive& ar, const Quaternion& t) -{ - ar << t.mVector; - - return ar; -} - -Archive& operator>> (Archive& ar, Quaternion& t) -{ - ar >> t.mVector; - - return ar; -} - -// Matrix -Archive& operator<< (Archive& ar, const Matrix& t) -{ - const float* data = t.AsFloat(); - - for( unsigned i = 0; i < sizeof(Matrix) / sizeof(float); ++i) - { - ar << *data; - ++data; - } - - return ar; -} - -Archive& operator>> (Archive& ar, Matrix& t) -{ - float* data = t.AsFloat(); - - for( unsigned i = 0; i < sizeof(Matrix) / sizeof(float); ++i) - { - ar >> *data; - ++data; - } - - return ar; -} - -/*---- std::string ----*/ -Archive& operator<< (Archive& ar, const std::string& t) -{ - unsigned int length = t.size(); - ar << length; - ar.Write(t.data(), length); - - return ar; -} - -Archive& operator>> (Archive& ar, std::string& t) -{ - unsigned int length = 0; - char* data = NULL; - - ar >> length; - data = new char[ length ]; - ar.Read(data, length); - t.assign(data, length); - delete [] data; - - return ar; -} - -} // namespace Serialize - -} // Internal - -} // Dali - diff --git a/dali/internal/event/resources/archive.h b/dali/internal/event/resources/archive.h deleted file mode 100644 index 2cd0d93..0000000 --- a/dali/internal/event/resources/archive.h +++ /dev/null @@ -1,283 +0,0 @@ -#if !defined(__DALI_INTERNAL_ARCHIVE_H__) -#define __DALI_INTERNAL_ARCHIVE_H__ - -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include -#include -#include - -namespace Dali -{ -struct Vector2; -struct Vector3; -struct Vector4; -class Matrix; -class Quaternion; - -namespace Internal -{ - -/** - * Archive class. Serializes data to a Tag-Length-Value archive - */ -class Archive -{ -public: - typedef std::pair ChunkHeader; - -public: - /** - * Constructor - * @param[in] buf An open streambuf - */ - Archive(std::streambuf& buf); - - /** - * Destructor - */ - virtual ~Archive(); - - /** - * Get archive version - */ - unsigned int GetVersion() const - { - return mVersion; - } - - /** - * Set archive version - * @param[in] version the version number - */ - void SetVersion(const unsigned int version) - { - mVersion = version; - } - - /** - * Returns the result of the archiving operation - * The result status is initialised to true on construction - * Any failure will set it to false - * @return the archiving result, true signals success. - */ - bool GetResult() const - { - return mResult; - } - - /** - * Set the archive status to failed - */ - void SetResultFailed() - { - mResult = false; - } - - /** - * Write a bytestream to the archive - * @param[in] data A pointer to the data - * @param[in] length The length of the data in bytes - * @return true if the data was successfully written - */ - virtual bool Write(const char* data, const unsigned int length) - { - return false; - } - - /** - * Read a bytestream from the archive - * @param[in] data A pointer to a buffer to store the data - * @param[in] length The length of the data in bytes - * @return true if the data was successfully read - */ - virtual bool Read(char* data, const unsigned int length) - { - return false; - } - - /** - * Open a new chunk - * @param[in] tag The FourCC tag for the chunk - * @return true if success. - */ - virtual bool OpenChunk(const unsigned int tag) = 0; - - /** - * Skip an entire chunk - * @param[in] tag The FourCC tag for the chunk - */ - virtual void SkipChunk(const unsigned int tag) - { - } - - /** - * Close the current chunk - * The chunk length is written to the archive - */ - virtual void CloseChunk() = 0; - - /** - * Peek at the tag of the next chunk. - * This will move the file pointer to the next even byte, - * then read the next four bytes - * @result The FourCC tag for the next chunk. - */ - virtual unsigned int PeekChunk() - { - return 0; - } - -protected: - unsigned int mVersion; - std::iostream mStream; - std::stack mChunkStack; - bool mResult; -}; // class Archive - -/** - * Archive specialization. Performs serialization to an Archive - */ -class OutputArchive : public Archive -{ -public: - OutputArchive(std::streambuf& buf, const unsigned int version); - virtual ~OutputArchive(); - -public: // from Archive - /** - * @copydoc Archive::Write() - */ - virtual bool Write(const char* data, const unsigned int length); - - /** - * @copydoc Archive::OpenChunk() - * @param[in] tag The chunk tag - */ - virtual bool OpenChunk(const unsigned int tag); - - /** - * @copydoc Archive::CloseChunk() - */ - virtual void CloseChunk(); - -}; // class OutputArchive - -/** - * Archive specialization. Performs serialization from an Archive - */ -class InputArchive : public Archive -{ -public: - InputArchive(std::streambuf& buf, const unsigned int version); - virtual ~InputArchive(); - -public: // from Archive - /** - * @copydoc Archive::Read() - */ - virtual bool Read(char* data, const unsigned int length); - - /** - * @copydoc Archive::OpenChunk() - * @param[in] tag The chunk tag - */ - virtual bool OpenChunk(const unsigned int tag); - - /** - * @copydoc Archive::SkipChunk() - * @param[in] tag The chunk tag - */ - virtual void SkipChunk(const unsigned int tag); - - /** - * @copydoc Archive::CloseChunk() - */ - virtual void CloseChunk(); - - /** - * @copydoc Archive::PeekChunk() - */ - virtual unsigned int PeekChunk(); - -public: - /** - * Set the archive version as read from the archive - * @param[in] version The archives version number - */ - void SetFileVersion(unsigned int version) - { - mFileVersion = version; - } - - /** - * Get the archive version number read from the archive - */ - unsigned int GetFileVersion() const - { - return mFileVersion; - } -private: - unsigned int mFileVersion; - -}; // class InputArchive - -namespace Serialize -{ - -Archive& operator<< (Archive&, const char&); -Archive& operator>> (Archive&, char&); -Archive& operator<< (Archive&, const unsigned char&); -Archive& operator>> (Archive&, unsigned char&); -Archive& operator<< (Archive&, const bool&); -Archive& operator>> (Archive&, bool&); -Archive& operator<< (Archive&, const short&); -Archive& operator>> (Archive&, short&); -Archive& operator<< (Archive&, const unsigned short&); -Archive& operator>> (Archive&, unsigned short&); -Archive& operator<< (Archive&, const int&); -Archive& operator>> (Archive&, int&); -Archive& operator<< (Archive&, const unsigned int&); -Archive& operator>> (Archive&, unsigned int&); -Archive& operator<< (Archive&, const float&); -Archive& operator>> (Archive&, float&); - -Archive& operator<< (Archive&, const std::string&); -Archive& operator>> (Archive&, std::string&); - -// math -Archive& operator<< (Archive&, const Vector2&); -Archive& operator>> (Archive&, Vector2&); -Archive& operator<< (Archive&, const Vector3&); -Archive& operator>> (Archive&, Vector3&); -Archive& operator<< (Archive&, const Vector4&); -Archive& operator>> (Archive&, Vector4&); -Archive& operator<< (Archive&, const Quaternion&); -Archive& operator>> (Archive&, Quaternion&); -Archive& operator<< (Archive&, const Matrix&); -Archive& operator>> (Archive&, Matrix&); - -} // namespace Serialize -} // Internal - -} // Dali - -#endif // !defined(__DALI_INTERNAL_ARCHIVE_H__) - - diff --git a/dali/internal/file.list b/dali/internal/file.list index a4d1c9d..507735d 100644 --- a/dali/internal/file.list +++ b/dali/internal/file.list @@ -87,7 +87,6 @@ internal_src_files = \ $(internal_src_dir)/event/rendering/renderer-impl.cpp \ $(internal_src_dir)/event/rendering/sampler-impl.cpp \ $(internal_src_dir)/event/rendering/shader-impl.cpp \ - $(internal_src_dir)/event/resources/archive.cpp \ $(internal_src_dir)/event/resources/image-ticket.cpp \ $(internal_src_dir)/event/resources/resource-client.cpp \ $(internal_src_dir)/event/resources/resource-ticket.cpp \ -- 2.7.4