* added geometry to frames for custom rendering

[casparcg] / test / psd-test / psd-test.cpp

diff --git a/test/psd-test/psd-test.cpp b/test/psd-test/psd-test.cpp
index 8bbe94bdbbad84c5f6431e866016fa66efbeee37..c42b6eba4a95f157876e609db2bd2a81588eadd3 100644 (file)
--- a/test/psd-test/psd-test.cpp
+++ b/test/psd-test/psd-test.cpp
@@ -10,36 +10,42 @@
 #include <iostream>
 
 #include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/detail/file_parser_error.hpp>
+#include <boost/property_tree/xml_parser.hpp>
 
 
 int _tmain(int argc, _TCHAR* argv[])
 {
        caspar::psd::psd_document doc;
-       doc.parse(L"C:\\Lokala Filer\\Utveckling\\CasparCG\\Server 2.1\\test\\data\\test1.psd");
-
-       int a = 42;
-
-       //std::wstringstream trace;
-
-       //trace << L"<doc filename='" << doc.filename() << L"' color_mode='" << caspar::psd::color_mode_to_string(doc.color_mode()) << L"' color_depth='" << doc.color_depth() << L"' channel_count='" << doc.channels_count() << L"' width='" << doc.width() << L"' height='" << doc.height() << L"'>" << std::endl;
-
-       //
-       //auto end = doc.layers().end();
-       //for(auto it = doc.layers().begin(); it != end; ++it)
-       //{
-       //      caspar::psd::layer_ptr layer = (*it);
-       //      trace << L"     <layer name='" << layer->name() << L"' opacity='" << layer->opacity() << L"'>" << std::endl;
-       //      if(layer->image())
-       //              trace << L"             <bounding-box left='" << layer->rect().left << "' top='" << layer->rect().top << "' right='" << layer->rect().right << "' bottom='" << layer->rect().bottom << "' />" << std::endl;
-       //      if(layer->mask())
-       //              trace << L"             <mask default-value='" << layer->default_mask_value() << "' left='" << layer->mask_rect().left << "' top='" << layer->mask_rect().top << "' right='" << layer->mask_rect().right << "' bottom='" << layer->mask_rect().bottom << "' />" << std::endl;
-       //      trace << L"     </layer>" << std::endl;
-       //}
-
-       //trace << L"</doc>" << std::endl;
-
-       //std::cout << caspar::u8(trace.str());
+       doc.parse(L"C:\\Lokala Filer\\Utveckling\\CasparCG\\Server 2.1\\shell\\media\\test1.psd");
+
+       std::wstringstream trace;
+
+       trace << L"<doc filename='" << doc.filename() << L"' color_mode='" << caspar::psd::color_mode_to_string(doc.color_mode()) << L"' color_depth='" << doc.color_depth() << L"' channel_count='" << doc.channels_count() << L"' width='" << doc.width() << L"' height='" << doc.height() << L"'>" << std::endl;
+       
+       auto end = doc.layers().end();
+       for(auto it = doc.layers().begin(); it != end; ++it)
+       {
+               caspar::psd::layer_ptr layer = (*it);
+               trace << L"     <layer name='" << layer->name() << L"' opacity='" << layer->opacity() << L"' flags='" << std::hex << layer->flags() << std::dec << "'>" << std::endl;
+               if(layer->image())
+                       trace << L"             <bounding-box left='" << layer->rect().left << "' top='" << layer->rect().top << "' right='" << layer->rect().right << "' bottom='" << layer->rect().bottom << "' />" << std::endl;
+               if(layer->mask())
+                       trace << L"             <mask default-value='" << layer->mask_info().default_value_ << "' flags='" <<  std::hex << (unsigned short) layer->mask_info().flags_ << std::dec << "' left='" << layer->mask_info().rect_.left << "' top='" << layer->mask_info().rect_.top << "' right='" << layer->mask_info().rect_.right << "' bottom='" << layer->mask_info().rect_.bottom << "' />" << std::endl;
+               if(layer->is_text())
+               {
+                       boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);
+                       boost::property_tree::write_xml(trace, (*it)->text_data(), w);
+               }
+               trace << L"     </layer>" << std::endl;
+       }
+
+       trace << L"</doc>" << std::endl;
+       
+       std::ofstream log("psd-log.txt");
+       log << caspar::u8(trace.str());
+       std::cout << caspar::u8(trace.str());
+       
        return 0;
 }