X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fcaptcha%2Fsimplecaptcha.cpp;h=41d7166ed41a5448130953a372a38f852ed8488e;hb=8a0a83a78390f22f99d4487cda2569909dfbc28e;hp=c030bca0a061c4f472d7b1a953c788e11191a723;hpb=d8f51eac91f86a1e00a05a5058a8fa9eb8732464;p=fms.git

diff --git a/src/freenet/captcha/simplecaptcha.cpp b/src/freenet/captcha/simplecaptcha.cpp
index c030bca..41d7166 100644
--- a/src/freenet/captcha/simplecaptcha.cpp
+++ b/src/freenet/captcha/simplecaptcha.cpp
@@ -10,8 +10,9 @@
 void SimpleCaptcha::Generate()
 {
 	BMP bmp;
-	int bmpwidth=100;
+	int bmpwidth=110;
 	int bmpheight=50;
+	RGBApixel lettercols[5];
 	std::string puzzlestring;
 	std::string tempfilename=GenerateRandomString(10);
 	tempfilename+=".bmp";
@@ -23,7 +24,7 @@ void SimpleCaptcha::Generate()
 	bmp.SetSize(bmpwidth,bmpheight);
 
 	// first draw some random lines around the bitmap
-	int numlines=(rand()%20)+10;
+	int numlines=(rand()%10)+10;
 	for(int i=0; i<numlines; i++)
 	{
 		RGBApixel pixel;
@@ -38,15 +39,101 @@ void SimpleCaptcha::Generate()
 		DrawAALine(bmp,x1,y1,x2,y2,pixel);
 	}
 
-	// print puzzle onto bitmap
+	// draw some random arcs
+	int numarcs=(rand()%10)+10;
+	for(int i=0; i<numarcs; i++)
+	{
+		RGBApixel pixel;
+		int x1=rand()%bmpwidth;
+		int y1=rand()%bmpwidth;
+		int radius=rand()%(bmpheight/2);
+		double startangle=(double)(rand()%360)*(3.14159/180);
+		double endangle=(double)(rand()%360)*(3.14159/180);
+		pixel.Red=100+(rand()%150);
+		pixel.Green=100+(rand()%150);
+		DrawArc(bmp,x1,y1,radius,startangle,endangle,pixel);
+	}
+
 	for(int i=0; i<5; i++)
 	{
 		// keep the colors dark
+		lettercols[i].Red=(rand()%200);
+		lettercols[i].Green=(rand()%200);
+		lettercols[i].Blue=(rand()%200);
+		// draw a line with the letter col
+		DrawAALine(bmp,rand()%bmpwidth,rand()%bmpheight,rand()%bmpwidth,rand()%bmpheight,lettercols[i]);
+	}
+
+	// print puzzle onto bitmap
+	for(int i=0; i<5; i++)
+	{
+		PrintLetter(bmp,puzzlestring[i],5+(i*20)+(rand()%11)-5,10+(rand()%10),20,lettercols[i]);
+	}
+
+	/* TOO dificult to solve with this
+	// skew image left/right
+	double skew=0;
+	for(int yy=0; yy<bmpheight; yy++)
+	{
 		RGBApixel pixel;
-		pixel.Red=(rand()%200);
-		pixel.Green=(rand()%200);
-		pixel.Blue=(rand()%200);
-		PrintLetter(bmp,puzzlestring[i],5+(i*20),10+(rand()%10),20,pixel);
+		skew=skew+(double)((rand()%11)-5)/20.0;
+		int xx;
+		for(xx=0; xx<skew; xx++)
+		{
+			pixel.Red=255;
+			pixel.Green=255;
+			pixel.Blue=255;
+			bmp.SetPixel(xx,yy,pixel);
+		}
+		if(skew<0)
+		{
+			for(xx=0; xx<bmpwidth+skew; xx++)
+			{
+				pixel=bmp.GetPixel(xx-skew,yy);
+				bmp.SetPixel(xx,yy,pixel);
+			}
+		}
+		else
+		{
+			for(xx=bmpwidth-1; xx>skew; xx--)
+			{
+				pixel=bmp.GetPixel(xx-skew,yy);
+				bmp.SetPixel(xx,yy,pixel);
+			}
+		}
+		for(xx=bmpwidth+skew; xx<bmpwidth; xx++)
+		{
+			pixel.Red=255;
+			pixel.Green=255;
+			pixel.Blue=255;
+			bmp.SetPixel(xx,yy,pixel);
+		}
+	}
+	*/
+
+	// generate noise for each pixel
+	for(int yy=0; yy<bmpheight; yy++)
+	{
+		for(int xx=0; xx<bmpwidth; xx++)
+		{
+			RGBApixel pixel=bmp.GetPixel(xx,yy);
+			int tempred=pixel.Red+(rand()%21)-10;
+			int tempgreen=pixel.Green+(rand()%21)-10;
+			int tempblue=pixel.Blue+(rand()%21)-10;
+
+			tempred < 0 ? tempred=0 : false;
+			tempred > 255 ? tempred=255 : false;
+			tempgreen < 0 ? tempgreen=0 : false;
+			tempgreen > 255 ? tempgreen=255 : false;
+			tempblue < 0 ? tempblue=0 : false;
+			tempblue > 255 ? tempblue=255 : false;
+
+			pixel.Red=tempred;
+			pixel.Green=tempgreen;
+			pixel.Blue=tempblue;
+
+			bmp.SetPixel(xx,yy,pixel);
+		}
 	}
 
 	bmp.WriteToFile(tempfilename.c_str());
@@ -56,7 +143,8 @@ void SimpleCaptcha::Generate()
 
 const std::string SimpleCaptcha::GenerateRandomString(const int len)
 {
-	static std::string chars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+	// no l,1 O,0 because they look too much alike
+	static std::string chars="abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ23456789";
 	std::string temp="";
 	for(int i=0; i<len; i++)
 	{
@@ -90,4 +178,4 @@ void SimpleCaptcha::ReadPuzzleData(const std::string &filename)
 		fread(&m_puzzle[0],1,filelen,infile);
 		fclose(infile);
 	}
-}
\ No newline at end of file
+}