Skip to content

Commit fa85bba

Browse files
SommosSommos
authored
Merge pull request #5 from Sommos/main
Fixed (1) / add (2) filters, modified UI
2 parents 4c3e9ec + 4eec94f commit fa85bba

20 files changed

+604
-194
lines changed

‎.vscode/c_cpp_properties.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "windows-gcc-x64",
5+
"includePath": [
6+
"${workspaceFolder}/**",
7+
"C:/msys64/mingw64/include/gtk-4.0",
8+
"C:/msys64/mingw64/include/glib-2.0",
9+
"C:/msys64/mingw64/include/**",
10+
"C:/msys64/mingw64/lib/**"
11+
],
12+
"defines": [
13+
"_DEBUG",
14+
"UNICODE",
15+
"_UNICODE"
16+
],
17+
"windowsSdkVersion": "10.0.22000.0",
18+
"compilerPath": "C:/msys64/mingw64/bin/gcc.exe",
19+
"cStandard": "c17",
20+
"cppStandard": "c++17",
21+
"intelliSenseMode": "windows-gcc-x64"
22+
}
23+
],
24+
"version": 4
25+
}

‎.vscode/launch.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "C/C++ Runner: Debug Session",
6+
"type": "cppdbg",
7+
"request": "launch",
8+
"args": [],
9+
"stopAtEntry": false,
10+
"externalConsole": true,
11+
"cwd": "c:/Users/Sommo/OneDrive/Documents/C_Projects/C_image_processing/src",
12+
"program": "c:/Users/Sommo/OneDrive/Documents/C_Projects/C_image_processing/src/build/Debug/outDebug",
13+
"MIMode": "gdb",
14+
"miDebuggerPath": "C:/msys64/mingw64/bin/gdb.exe",
15+
"setupCommands": [
16+
{
17+
"description": "Enable pretty-printing for gdb",
18+
"text": "-enable-pretty-printing",
19+
"ignoreFailures": true
20+
}
21+
]
22+
}
23+
]
24+
}

‎.vscode/settings.json‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"C_Cpp_Runner.cCompilerPath": "C:/msys64/mingw64/bin/gcc.exe",
3+
"C_Cpp_Runner.cppCompilerPath": "C:/msys64/mingw64/bin/g++.exe",
4+
"C_Cpp_Runner.debuggerPath": "C:/msys64/mingw64/bin/gdb.exe",
5+
"C_Cpp_Runner.cStandard": "c17",
6+
"C_Cpp_Runner.cppStandard": "c++17",
7+
"C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat",
8+
"C_Cpp_Runner.useMsvc": false,
9+
"C_Cpp_Runner.warnings": [
10+
"-Wall",
11+
"-Wextra",
12+
"-Wpedantic",
13+
"-Wshadow",
14+
"-Wformat=2",
15+
"-Wcast-align",
16+
"-Wconversion",
17+
"-Wsign-conversion",
18+
"-Wnull-dereference"
19+
],
20+
"C_Cpp_Runner.msvcWarnings": [
21+
"/W4",
22+
"/permissive-",
23+
"/w14242",
24+
"/w14287",
25+
"/w14296",
26+
"/w14311",
27+
"/w14826",
28+
"/w44062",
29+
"/w44242",
30+
"/w14905",
31+
"/w14906",
32+
"/w14263",
33+
"/w44265",
34+
"/w14928"
35+
],
36+
"C_Cpp_Runner.enableWarnings": true,
37+
"C_Cpp_Runner.warningsAsError": false,
38+
"C_Cpp_Runner.compilerArgs": [],
39+
"C_Cpp_Runner.linkerArgs": [],
40+
"C_Cpp_Runner.includePaths": [
41+
"${workspaceFolder}/**",
42+
"C:/msys64/mingw64/include/gtk-4.0",
43+
"C:/msys64/mingw64/include/glib-2.0",
44+
"C:/msys64/mingw64/include/**",
45+
"C:/msys64/mingw64/lib/**"
46+
],
47+
"C_Cpp_Runner.includeSearch": [
48+
"*",
49+
"**/*"
50+
],
51+
"C_Cpp_Runner.excludeSearch": [
52+
"**/build",
53+
"**/build/**",
54+
"**/.*",
55+
"**/.*/**",
56+
"**/.vscode",
57+
"**/.vscode/**"
58+
],
59+
"C_Cpp_Runner.useAddressSanitizer": false,
60+
"C_Cpp_Runner.useUndefinedSanitizer": false,
61+
"C_Cpp_Runner.useLeakSanitizer": false,
62+
"C_Cpp_Runner.showCompilationTime": false,
63+
"C_Cpp_Runner.useLinkTimeOptimization": false,
64+
"files.associations": {
65+
"stdio.h": "c"
66+
}
67+
}

‎.vscode/tasks.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "cppbuild",
6+
"label": "C/C++: gcc.exe build active file",
7+
"command": "C:/msys64/mingw64/bin/gcc.exe",
8+
"args": [
9+
"-fdiagnostics-color=always",
10+
"-g",
11+
"-IC:/msys64/mingw64/include/gtk-4.0",
12+
"-IC:/msys64/mingw64/include/pango-1.0",
13+
"-IC:/msys64/mingw64/include",
14+
"-IC:/msys64/mingw64/include/glib-2.0",
15+
"-IC:/msys64/mingw64/lib/glib-2.0/include",
16+
"-IC:/msys64/mingw64/include/harfbuzz",
17+
"-IC:/msys64/mingw64/include/freetype2",
18+
"-IC:/msys64/mingw64/include/libpng16",
19+
"-IC:/msys64/mingw64/include/fribidi",
20+
"-IC:/msys64/mingw64/include/cairo",
21+
"-IC:/msys64/mingw64/include/pixman-1",
22+
"-IC:/msys64/mingw64/include/gdk-pixbuf-2.0",
23+
"-IC:/msys64/mingw64/include/webp",
24+
"-DLIBDEFLATE_DLL",
25+
"-IC:/msys64/mingw64/include/graphene-1.0",
26+
"-IC:/msys64/mingw64/lib/graphene-1.0/include",
27+
"-mfpmath=sse",
28+
"-msse",
29+
"-msse2",
30+
31+
"${file}",
32+
33+
"-LC:/msys64/mingw64/lib",
34+
"-lgtk-4",
35+
"-lpangowin32-1.0",
36+
"-lpangocairo-1.0",
37+
"-lpango-1.0",
38+
"-lharfbuzz",
39+
"-lgdk_pixbuf-2.0",
40+
"-lcairo-gobject",
41+
"-lcairo",
42+
"-lgraphene-1.0",
43+
"-lgio-2.0",
44+
"-lgobject-2.0",
45+
"-lglib-2.0",
46+
"-lintl",
47+
48+
"-o",
49+
"${fileDirname}\\${fileBasenameNoExtension}.exe"
50+
],
51+
"options": {
52+
"cwd": "C:/msys64/mingw64/bin"
53+
},
54+
"problemMatcher": [
55+
"$gcc"
56+
],
57+
"group": "build",
58+
"detail": "compiler: C:/msys64/mingw64/bin/gcc.exe"
59+
}
60+
]
61+
}

‎C_image_processing/filters/dark_filter.c‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎C_image_processing/filters/sepia_filter.c‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# C Image Processing
22

33
<p align="center">
4-
<img src="readme_image_0.png" width="400"/>
5-
<img src="readme_image_1.png" width="400"/>
6-
<img src="readme_image_2.png" width="400"/>
7-
<img src="readme_image_3.png" width="400"/>
4+
<img src="readme_image_0.png" width="200" height="220"/>
5+
<img src="readme_image_1.png" width="200" height="220"/>
6+
<img src="readme_image_2.png" width="200" height="220"/>
7+
<img src="readme_image_3.png" width="200" height="220"/>
88
</p>
99

1010
This program is to builds a simple library of image processing functions in C. The library is then used to create a program that can read in a PPM image, apply a filter to it, and then write the modified image to a new file.

.gitignore renamed to src/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ output.bmp
126126
test_image_black_and_white.bmp
127127
test_image_bright.bmp
128128
test_image_dark.bmp
129+
test_image_emboss.bmp
129130
test_image_negative.bmp
131+
test_image_pixelate.bmp
130132
test_image_rgb_to_gray.bmp
131133
test_image_sepia.bmp

C_image_processing/assets/fonts/big_noodle_titling.ttf renamed to src/assets/fonts/big_noodle_titling.ttf

File renamed without changes.

C_image_processing/assets/fonts/big_noodle_titling_oblique.ttf renamed to src/assets/fonts/big_noodle_titling_oblique.ttf

File renamed without changes.

0 commit comments

Comments
 (0)