fixed global using namespace issue with compilation and reverted rece…

…nt change to transforms that reseted it to default
MolecularMatters · Mar 1, 2024 · a580424 · a580424
1 parent ace0fa9
commit a580424
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/Psd/extension/PsdTextLayerUtils.cpp b/src/Psd/extension/PsdTextLayerUtils.cpp
@@ -373,13 +373,6 @@ namespace textLayers
  layerData->fontColor[2] = -1.f;
  layerData->fontColor[3] = 1.f;
 
- layerData->transform[0] = 1.f;
- layerData->transform[1] = 0.f;
- layerData->transform[2] = 0.f;
- layerData->transform[3] = 1.f;
- layerData->transform[4] = 0.f;
- layerData->transform[5] = 0.f;
-
  layerData->fontSize = -1.f;
  layerData->leading = -1.f;
  layerData->baseline = -1.f;

diff --git a/src/Psd/extension/PsdTextLayerUtils.h b/src/Psd/extension/PsdTextLayerUtils.h
@@ -8,15 +8,15 @@
 #include <unordered_map>
 #include <functional>
 
-using namespace std;
-
 PSD_NAMESPACE_BEGIN
 
 struct Layer;
 class Allocator;
 
 namespace textLayers
 {
+ using namespace std;
+
  enum JUSTIFICATION_TYPE : int8_t
  {
  JUST_RIGHT = 0,