diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp
index 1b7d904a40..f34e692792 100644
--- a/cocos/2d/CCParticleSystem.cpp
+++ b/cocos/2d/CCParticleSystem.cpp
@@ -351,18 +351,15 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
                 {
                     string textureDir = textureName.substr(0, rPos + 1);
                     
-                    if (dirname.size()>0 && textureDir != dirname)
+                    if (!dirname.empty() && textureDir != dirname)
                     {
                         textureName = textureName.substr(rPos+1);
                         textureName = dirname + textureName;
                     }
                 }
-                else
+                else if (!dirname.empty() && !textureName.empty())
                 {
-                    if (dirname.size()>0)
-                    {
-                        textureName = dirname + textureName;
-                    }
+                	textureName = dirname + textureName;
                 }
                 
                 Texture2D *tex = nullptr;
@@ -372,7 +369,7 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
                     // set not pop-up message box when load image failed
                     bool notify = FileUtils::getInstance()->isPopupNotify();
                     FileUtils::getInstance()->setPopupNotify(false);
-                    tex = Director::getInstance()->getTextureCache()->addImage(textureName.c_str());
+                    tex = Director::getInstance()->getTextureCache()->addImage(textureName);
                     // reset the value of UIImage notify
                     FileUtils::getInstance()->setPopupNotify(notify);
                 }
@@ -409,10 +406,12 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
                         image->release();
                     }
                 }
-                if (_configName.length()>0)
+                
+                if (!_configName.empty())
                 {
-                  _yCoordFlipped = dictionary["yCoordFlipped"].asInt();
+                    _yCoordFlipped = dictionary["yCoordFlipped"].asInt();
                 }
+                
                 CCASSERT( this->_texture != nullptr, "CCParticleSystem: error loading the texture");
             }
             ret = true;
diff --git a/cocos/2d/CCTextureCache.h b/cocos/2d/CCTextureCache.h
index 800f910352..8d55c93656 100644
--- a/cocos/2d/CCTextureCache.h
+++ b/cocos/2d/CCTextureCache.h
@@ -106,7 +106,7 @@ public:
     * If the filename was not previously loaded, it will create a new Texture2D
     *  object and it will return it. It will use the filename as a key.
     * Otherwise it will return a reference of a previously loaded image.
-    * Supported image extensions: .png, .bmp, .tiff, .jpeg, .pvr, .gif
+    * Supported image extensions: .png, .bmp, .tiff, .jpeg, .pvr
     */
     Texture2D* addImage(const std::string &filepath);