Merge pull request #374 from hummelstrand/readme-2.1.0-update

[casparcg] / modules / psd / layer.h

diff --git a/modules/psd/layer.h b/modules/psd/layer.h
index d094b679e2c950b38ec3a464d92cf4645a41c0f5..33a3422e678900f6ede390344162c7e3e37b90ab 100644 (file)
--- a/modules/psd/layer.h
+++ b/modules/psd/layer.h
@@ -19,21 +19,19 @@
 * Author: Niklas P Andersson, niklas.p.andersson@svt.se
 */
 
-#ifndef _PSDLAYER_H__
-#define _PSDLAYER_H__
-
 #pragma once
 
-#include <vector>
-#include <string>
-#include "common/memory.h"
-#include "util\bigendian_file_input_stream.h"
-
+#include "util/bigendian_file_input_stream.h"
 #include "image.h"
 #include "misc.h"
 #include "channel.h"
+
 #include <boost/property_tree/ptree_fwd.hpp>
 
+#include <vector>
+#include <string>
+#include <common/memory.h>
+
 namespace caspar { namespace psd {
 
 class layer;
@@ -50,45 +48,45 @@ public:
        {
                friend struct layer::impl;
 
-               void read_mask_data(BEFileInputStream&);
+               void read_mask_data(bigendian_file_input_stream&);
 
                image8bit_ptr   bitmap_;
-               unsigned char   default_value_;
-               unsigned char   flags_;
+               std::uint8_t    default_value_;
+               std::uint8_t    flags_;
                char                    mask_id_;
-               rect<long>              rect_;
+               rect<int>               rect_;
 
        public:
                bool enabled() const { return (flags_ & 2) == 0; }
                bool linked() const { return (flags_ & 1) == 0;  }
                bool inverted() const { return (flags_ & 4) == 4; }
 
-               const point<long>& location() const { return rect_.location; }
+               const point<int>& location() const { return rect_.location; }
                const image8bit_ptr& bitmap() const { return bitmap_; }
        };
 
        layer();
 
-       void populate(BEFileInputStream&, const psd_document&);
-       void read_channel_data(BEFileInputStream&);
+       void populate(bigendian_file_input_stream&, const psd_document&);
+       void read_channel_data(bigendian_file_input_stream&);
 
        const std::wstring& name() const;
-       unsigned char opacity() const;
-       unsigned short sheet_color() const;
+       int opacity() const;
+       int sheet_color() const;
        bool is_visible();
        bool is_position_protected();
 
-       float text_scale() const;
+       double text_scale() const;
        bool is_text() const;
        const boost::property_tree::wptree& text_data() const;
 
        bool is_solid() const;
-       color<unsigned char> solid_color() const;
+       color<std::uint8_t> solid_color() const;
 
        bool has_timeline() const;
        const boost::property_tree::wptree& timeline_data() const;
 
-       const point<long>& location() const;
+       const point<int>& location() const;
        const image8bit_ptr& bitmap() const;
 
        int link_group_id() const;
@@ -97,5 +95,3 @@ public:
 
 }      //namespace psd
 }      //namespace caspar
-
-#endif //_PSDLAYER_H__
\ No newline at end of file