X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreenet%2Fcaptcha%2Falternatecaptcha1.cpp;h=83b2ca581362f6d9f0abd72becd91dfd5647bec6;hb=b7f3b3e6ae9dc527f02b5c06e2eeae0e9cac3ad8;hp=e76a57ce15b55247d9fdb3069b4ab58128cddcb4;hpb=f8c0410b12183ecb40aafbb44086fa146b25b528;p=fms.git

diff --git a/src/freenet/captcha/alternatecaptcha1.cpp b/src/freenet/captcha/alternatecaptcha1.cpp
index e76a57c..83b2ca5 100644
--- a/src/freenet/captcha/alternatecaptcha1.cpp
+++ b/src/freenet/captcha/alternatecaptcha1.cpp
@@ -1,23 +1,13 @@
 #include "../../../include/freenet/captcha/alternatecaptcha1.h"
 
-#include <Poco/Path.h>
-#include <Poco/DirectoryIterator.h>
-
 #include <cmath>
 
 #ifdef ALTERNATE_CAPTCHA
 
-bool AlternateCaptcha1::m_fontsloaded(false);
-std::vector<FreeImage::Font> AlternateCaptcha1::m_fonts;
-
 AlternateCaptcha1::AlternateCaptcha1()
 {
-	if(m_fontsloaded==false)
-	{
-		FreeImage_Initialise(true);
-		LoadFonts();
-		m_fontsloaded=true;
-	}
+	AlternateCaptchaFonts fonts;
+	m_fonts=fonts.Fonts();
 }
 
 void AlternateCaptcha1::Generate()
@@ -127,24 +117,4 @@ const bool AlternateCaptcha1::GetSolution(std::vector<unsigned char> &solution)
 	return true;
 }
 
-void AlternateCaptcha1::LoadFonts()
-{
-
-	FreeImage::Bitmap bmp;
-	Poco::Path path("fonts");
-	Poco::DirectoryIterator di(path);
-	Poco::DirectoryIterator end;
-
-	while(di!=end)
-	{
-		if(di.name().find("bmp")!=std::string::npos)
-		{
-			bmp.Load("bmp",di.path().toString());
-			m_fonts.push_back(FreeImage::Font(bmp));
-		}
-		++di;
-	}
-
-}
-
 #endif	// ALTERNATE_CAPTCHA