Merge branch 'developing' of https://github.com/ARM-software/Arm-2D into developing

Author: GorgonMeducer

ARM.Arm-2D.pdsc

@@ -477,16 +477,16 @@
           </RTE_Components_h>
         </component>
 
-        <component Cclass="Acceleration" Cgroup="Arm-2D Extras" Csub="Loaders" Cversion="5.3.7" condition="Arm-2D-Loaders">
+        <component Cclass="Acceleration" Cgroup="Arm-2D Extras" Csub="Loaders" Cversion="5.4.0" condition="Arm-2D-Loaders">
           <description>A helper service for loading various resource, e.g. loading baseline jpg files using TJpgDec, ZJpgDec, loading Lossless Compressed images (*.QOI) and loading font files using FreeType etc.</description>
           <files>
             <file category="include"     name="examples/common/loader/" />
             <file category="sourceC"     name="examples/common/loader/__arm_2d_loader_common.c" />
 
             <file category="sourceC"     name="examples/common/loader/generic_loader/arm_2d_generic_loader.c" />
 
-            <file category="header"      name="examples/common/loader/generic_loader/template/user_generic_loader_template.h"   attr="template"  select="User Generic Loader Template" version="1.0.0"/>
-            <file category="sourceC"     name="examples/common/loader/generic_loader/template/user_generic_loader_template.c"   attr="template"  select="User Generic Loader Template" version="1.0.0"/>
+            <file category="header"      name="examples/common/loader/generic_loader/template/user_generic_loader_template.h"   attr="template"  select="User Generic Loader Template" version="1.1.0"/>
+            <file category="sourceC"     name="examples/common/loader/generic_loader/template/user_generic_loader_template.c"   attr="template"  select="User Generic Loader Template" version="1.1.0"/>
 
             <file category="sourceC"     name="examples/common/loader/tjpgd_loader/tjpgd_loader.c" />
             <file category="sourceC"     name="examples/common/loader/tjpgd_loader/tjpgd/tjpgd.c" />

examples/common/loader/generic_loader/template/user_generic_loader_template.h

@@ -80,7 +80,7 @@ struct <name>_t {
 
     union {
         arm_2d_tile_t tTile;
-        implement(arm_generic_loader_t);
+        inherit(arm_generic_loader_t);
     };
 
 ARM_PRIVATE(

examples/common/loader/qoi_loader/arm_qoi_cfg.h

@@ -5,7 +5,7 @@
 #ifndef __ARM_2D_QOI_CFG_H__
 #define __ARM_2D_QOI_CFG_H__
 
-#include "arm_2d_cfg.h"
+#include "arm_2d.h"
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> -----------------
 //

examples/common/loader/tjpgd_loader/arm_tjpgd_cfg.h

@@ -4,7 +4,7 @@
 #ifndef __ARM_2D_TJPGDEC_CFG_H__
 #define __ARM_2D_TJPGDEC_CFG_H__
 
-#include "arm_2d_cfg.h"
+#include "arm_2d.h"
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> -----------------
 //

examples/common/loader/zjpgd_loader/arm_zjpgd_cfg.h

@@ -5,7 +5,7 @@
 #ifndef __ARM_2D_ZJPGD_CFG_H__
 #define __ARM_2D_ZJPGD_CFG_H__
 
-#include "arm_2d_cfg.h"
+#include "arm_2d.h"
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> -----------------
 //